summaryrefslogtreecommitdiffstats
path: root/skia
diff options
context:
space:
mode:
authorreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-01 11:55:19 +0000
committerreed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-01 11:55:19 +0000
commitdfba6f3d38baf03d6fe62f1b30ce4f970e929474 (patch)
tree1b09f6484d073c6b441e5472134bd4c4538cd56a /skia
parent05871842bf707ba7313954b43d53935164acbad5 (diff)
downloadchromium_src-dfba6f3d38baf03d6fe62f1b30ce4f970e929474.zip
chromium_src-dfba6f3d38baf03d6fe62f1b30ce4f970e929474.tar.gz
chromium_src-dfba6f3d38baf03d6fe62f1b30ce4f970e929474.tar.bz2
setBitmapDevice is going away from Skia (and has no callers in Skia or Chrome)
so remove it from platform_canvas. Review URL: https://codereview.chromium.org/10982097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r--skia/ext/platform_canvas.cc5
-rw-r--r--skia/ext/platform_canvas.h8
2 files changed, 0 insertions, 13 deletions
diff --git a/skia/ext/platform_canvas.cc b/skia/ext/platform_canvas.cc
index d7cfc75..4378b90 100644
--- a/skia/ext/platform_canvas.cc
+++ b/skia/ext/platform_canvas.cc
@@ -11,11 +11,6 @@ namespace skia {
PlatformCanvas::PlatformCanvas() {}
-SkDevice* PlatformCanvas::setBitmapDevice(const SkBitmap&) {
- SkASSERT(false); // Should not be called.
- return NULL;
-}
-
// static
size_t PlatformCanvas::StrideForWidth(unsigned width) {
return 4 * width;
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
index cbeb95b..e030ad7 100644
--- a/skia/ext/platform_canvas.h
+++ b/skia/ext/platform_canvas.h
@@ -75,14 +75,6 @@ class SK_API PlatformCanvas : public SkCanvas {
// Helper method used internally by the initialize() methods.
bool initializeWithDevice(SkDevice* device);
- // Unimplemented. This is to try to prevent people from calling this function
- // on SkCanvas. SkCanvas' version is not virtual, so we can't prevent this
- // 100%, but hopefully this will make people notice and not use the function.
- // Calling SkCanvas' version will create a new device which is not compatible
- // with us and we will crash if somebody tries to draw into it with
- // CoreGraphics.
- virtual SkDevice* setBitmapDevice(const SkBitmap& bitmap);
-
// Disallow copy and assign
PlatformCanvas(const PlatformCanvas&);
PlatformCanvas& operator=(const PlatformCanvas&);