Index: src/core/SkCanvas.cpp |
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp |
index 055e6737a6fd5bfc48242984f6a7db7d244646d5..ce99546728a09171bf57aa51cb30daadeb42ede2 100644 |
--- a/src/core/SkCanvas.cpp |
+++ b/src/core/SkCanvas.cpp |
@@ -6,11 +6,11 @@ |
*/ |
#include "SkCanvas.h" |
-#include "SkCanvasDrawable.h" |
#include "SkCanvasPriv.h" |
#include "SkBitmapDevice.h" |
#include "SkDeviceImageFilterProxy.h" |
#include "SkDraw.h" |
+#include "SkDrawable.h" |
#include "SkDrawFilter.h" |
#include "SkDrawLooper.h" |
#include "SkImage.h" |
@@ -2293,13 +2293,13 @@ void SkCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4], |
LOOPER_END |
} |
-void SkCanvas::EXPERIMENTAL_drawDrawable(SkCanvasDrawable* dr) { |
+void SkCanvas::drawDrawable(SkDrawable* dr) { |
if (dr && !this->quickReject(dr->getBounds())) { |
this->onDrawDrawable(dr); |
} |
} |
-void SkCanvas::onDrawDrawable(SkCanvasDrawable* dr) { |
+void SkCanvas::onDrawDrawable(SkDrawable* dr) { |
dr->draw(this); |
} |