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

Unified Diff: src/core/SkCanvas.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
Index: src/core/SkCanvas.cpp
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 2cfe8ae2da8b92e65a12b177eb7ef27dea7268fc..42d0382397d55c4b26b0d14558b13898e0bbb068 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -856,7 +856,7 @@ SkBaseDevice* SkCanvas::getTopDevice(bool updateMatrixClip) const {
}
bool SkCanvas::readPixels(SkBitmap* bitmap, int x, int y) {
- if (kUnknown_SkColorType == bitmap->colorType() || bitmap->getTexture()) {
+ if (kUnknown_SkColorType == bitmap->colorType()) {
return false;
}
@@ -918,10 +918,6 @@ bool SkCanvas::readPixels(const SkImageInfo& dstInfo, void* dstP, size_t rowByte
}
bool SkCanvas::writePixels(const SkBitmap& bitmap, int x, int y) {
- if (bitmap.getTexture()) {
- return false;
- }
-
SkAutoPixmapUnlock unlocker;
if (bitmap.requestLock(&unlocker)) {
const SkPixmap& pm = unlocker.pixmap();

Powered by Google App Engine
This is Rietveld 408576698