diff options
| author |  reed <reed@google.com> | 2016-08-05 12:07:41 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-08-05 12:07:41 -0700 |
| commit | 1ec04d9553af68b458c8dd6bd18d8c25ebd41d7a (patch) | |
| tree | 11c3db498c2c6705366cc02789597ee59c2cbd8c /src/image/SkSurface_Raster.cpp | |
| parent | 40254c2c2dc28a34f96294d5a1ad94a99b0be8a6 (diff) | |
rename FoceCopyMode to SkCopyPixelMode
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2220603002
Review-Url: https://codereview.chromium.org/2220603002
Diffstat (limited to 'src/image/SkSurface_Raster.cpp')
| -rw-r--r-- | src/image/SkSurface_Raster.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/image/SkSurface_Raster.cpp b/src/image/SkSurface_Raster.cpp index c1be0b7fc5..90f26becb2 100644 --- a/src/image/SkSurface_Raster.cpp +++ b/src/image/SkSurface_Raster.cpp @@ -24,7 +24,7 @@ public: SkCanvas* onNewCanvas() override; sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override; - sk_sp<SkImage> onNewImageSnapshot(SkBudgeted, ForceCopyMode) override; + sk_sp<SkImage> onNewImageSnapshot(SkBudgeted, SkCopyPixelsMode) override; void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) override; void onCopyOnWrite(ContentChangeMode) override; void onRestoreBackingMutability() override; @@ -118,7 +118,7 @@ void SkSurface_Raster::onDraw(SkCanvas* canvas, SkScalar x, SkScalar y, canvas->drawBitmap(fBitmap, x, y, paint); } -sk_sp<SkImage> SkSurface_Raster::onNewImageSnapshot(SkBudgeted, ForceCopyMode forceCopyMode) { +sk_sp<SkImage> SkSurface_Raster::onNewImageSnapshot(SkBudgeted, SkCopyPixelsMode cpm) { if (fWeOwnThePixels) { // SkImage_raster requires these pixels are immutable for its full lifetime. // We'll undo this via onRestoreBackingMutability() if we can avoid the COW. @@ -126,12 +126,12 @@ sk_sp<SkImage> SkSurface_Raster::onNewImageSnapshot(SkBudgeted, ForceCopyMode fo pr->setTemporarilyImmutable(); } } else { - forceCopyMode = kYes_ForceCopyMode; + cpm = kAlways_SkCopyPixelsMode; } // Our pixels are in memory, so read access on the snapshot SkImage could be cheap. // Lock the shared pixel ref to ensure peekPixels() is usable. - return SkMakeImageFromRasterBitmap(fBitmap, forceCopyMode); + return SkMakeImageFromRasterBitmap(fBitmap, cpm); } void SkSurface_Raster::onRestoreBackingMutability() { |