Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Unified Diff: tools/picture_utils.cpp

Issue 2175873002: remove/deprecate SkBitmap::getTexture, as it now always returns false (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: kill AutoBitmapTexture Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« src/gpu/SkGpuDevice.cpp ('K') | « src/image/SkImage_Raster.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/picture_utils.cpp
diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp
index a6803c67db42efdb26d5a4d8a50869860350a65c..453320122b7092f661c9697e72270258201adbb3 100644
--- a/tools/picture_utils.cpp
+++ b/tools/picture_utils.cpp
@@ -18,9 +18,8 @@
namespace sk_tools {
void force_all_opaque(const SkBitmap& bitmap) {
- SkASSERT(nullptr == bitmap.getTexture());
SkASSERT(kN32_SkColorType == bitmap.colorType());
- if (bitmap.getTexture() || kN32_SkColorType == bitmap.colorType()) {
+ if (kN32_SkColorType == bitmap.colorType()) {
return;
}
« src/gpu/SkGpuDevice.cpp ('K') | « src/image/SkImage_Raster.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698