aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-07 16:09:26 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-07 16:09:26 +0000
commit5d54c29c70118dd8f038acf19c5293adbb64cdf1 (patch)
tree7d7912f7e12c275c1f98df8fb928026d527777d0
parent20c4ebe9bf64e0ee1424d8b619c1010454fd37f5 (diff)
remove unneeded SK_SUPPORT_LEGACY_CANVAS_CREATECOMPATIBLEDEVICE
git-svn-id: http://skia.googlecode.com/svn/trunk@13363 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--include/core/SkCanvas.h12
-rw-r--r--src/core/SkCanvas.cpp8
2 files changed, 0 insertions, 20 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index e6c9ee2fab..7235efb2f0 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -18,8 +18,6 @@
#include "SkRegion.h"
#include "SkXfermode.h"
-//#define SK_SUPPORT_LEGACY_CANVAS_CREATECOMPATIBLEDEVICE
-
class SkBounder;
class SkBaseDevice;
class SkDraw;
@@ -113,16 +111,6 @@ public:
*/
SkBaseDevice* getTopDevice(bool updateMatrixClip = false) const;
-#ifdef SK_SUPPORT_LEGACY_CANVAS_CREATECOMPATIBLEDEVICE
- /**
- * Shortcut for getDevice()->createCompatibleDevice(...).
- * If getDevice() == NULL, this method does nothing, and returns NULL.
- */
- SkBaseDevice* createCompatibleDevice(SkBitmap::Config config,
- int width, int height,
- bool isOpaque);
-#endif
-
/**
* Create a new surface matching the specified info, one that attempts to
* be maximally compatible when used with this canvas.
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index a14bb63e5d..20662d9af0 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -851,14 +851,6 @@ static SkBaseDevice* createCompatibleDevice(SkCanvas* canvas,
}
}
-#ifdef SK_SUPPORT_LEGACY_CANVAS_CREATECOMPATIBLEDEVICE
-SkBaseDevice* SkCanvas::createCompatibleDevice(SkBitmap::Config config,
- int width, int height,
- bool isOpaque) {
- return createCompatibleDevice(this, config, width, height, isOpaque);
-}
-#endif
-
int SkCanvas::internalSaveLayer(const SkRect* bounds, const SkPaint* paint,
SaveFlags flags, bool justForImageFilter) {
// do this before we create the layer. We don't call the public save() since