diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-03-17 17:11:37 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-17 17:44:01 +0000 |
| commit | 31249bb2df023868e4585f14519bf17c835f8700 (patch) | |
| tree | 2490cadaa74df7ffad4b41fdf33b8be4bae91bb4 /include/core | |
| parent | b2082afc1d2076576327d9d1de5fbec6b13403fe (diff) | |
Revert "Revert "Remove budgeted parameter from SkSurface::makeImageSnapshot""
This reverts commit 9e9188f84b15a25e27f63d5f8de3ccd393d9a173.
Reason for revert: Android-side fix has landed
Original change's description:
> Revert "Remove budgeted parameter from SkSurface::makeImageSnapshot"
>
> This reverts commit b64bcbdc3a5aa7b9e3ff216e4617ddc1db9260b5.
>
> Reason for revert:
>
> Android build failed as shown below.
>
> frameworks/base/libs/hwui/VkLayer.cpp:32:41: error: too many arguments to function call, expected 0, have 1
> mImage = surface->makeImageSnapshot(SkBudgeted::kNo);
>
> Original change's description:
> > Remove budgeted parameter from SkSurface::makeImageSnapshot
> >
> > This unused feature complicates MDB.
> >
> > Chrome compiles locally for me with this CL.
> >
> > Change-Id: I611e464885fb984030eace43ead42cf39d0e7f72
> > Reviewed-on: https://skia-review.googlesource.com/9734
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Robert Phillips <robertphillips@google.com>
> >
>
> TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Change-Id: Iae6e313c15b2352bd0d4fc7b5629de0a51ac398e
> Reviewed-on: https://skia-review.googlesource.com/9788
> Reviewed-by: Yuqian Li <liyuqian@google.com>
> Commit-Queue: Yuqian Li <liyuqian@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org,liyuqian@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Change-Id: If07d1b5db6e6c618d37445a0cf127780ed243a92
Reviewed-on: https://skia-review.googlesource.com/9843
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkSurface.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/core/SkSurface.h b/include/core/SkSurface.h index be657b1c62..52c0e5841a 100644 --- a/include/core/SkSurface.h +++ b/include/core/SkSurface.h @@ -250,11 +250,10 @@ public: /** * Returns an image of the current state of the surface pixels up to this * point. Subsequent changes to the surface (by drawing into its canvas) - * will not be reflected in this image. If a copy must be made the Budgeted - * parameter controls whether it counts against the resource budget - * (currently for the gpu backend only). + * will not be reflected in this image. For the GPU-backend, the budgeting + * decision for the snapped image will match that of the surface. */ - sk_sp<SkImage> makeImageSnapshot(SkBudgeted = SkBudgeted::kYes); + sk_sp<SkImage> makeImageSnapshot(); /** * Though the caller could get a snapshot image explicitly, and draw that, |