From 4f5a79c676757c0f218156077fb0575d46a6583c Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Wed, 7 Feb 2018 15:51:00 -0500 Subject: remove kRW_LegacyBitmapMode experiment to see if there are any unknown dependencies on kRW_LegacyBitmapMode R=reed@google.com,fmalita@chromium.org,bungeman@google.com Bug: skia:5615 Change-Id: I2cc578570ac18cd31c3520e1bd801f4a7a669347 Reviewed-on: https://skia-review.googlesource.com/105283 Reviewed-by: Florin Malita Reviewed-by: Mike Reed Reviewed-by: Ben Wagner Commit-Queue: Cary Clark --- src/image/SkImage.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/image/SkImage.cpp') diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 375c43e68d..4d54a1c838 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -215,11 +215,11 @@ sk_sp SkImage::MakeFromBitmap(const SkBitmap& bm) { return SkMakeImageFromRasterBitmap(bm, kIfMutable_SkCopyPixelsMode); } -bool SkImage::asLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) const { - return as_IB(this)->onAsLegacyBitmap(bitmap, mode); +bool SkImage::asLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode ) const { + return as_IB(this)->onAsLegacyBitmap(bitmap); } -bool SkImage_Base::onAsLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) const { +bool SkImage_Base::onAsLegacyBitmap(SkBitmap* bitmap) const { // As the base-class, all we can do is make a copy (regardless of mode). // Subclasses that want to be more optimal should override. SkImageInfo info = this->onImageInfo().makeColorType(kN32_SkColorType).makeColorSpace(nullptr); @@ -231,9 +231,7 @@ bool SkImage_Base::onAsLegacyBitmap(SkBitmap* bitmap, LegacyBitmapMode mode) con return false; } - if (kRO_LegacyBitmapMode == mode) { - bitmap->setImmutable(); - } + bitmap->setImmutable(); return true; } -- cgit v1.2.3