diff options
| author |  reed <reed@google.com> | 2015-02-06 08:36:15 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-06 08:36:15 -0800 |
| commit | 3cb3840c9af6f70896cf5565a38d4ee03c02d767 (patch) | |
| tree | cca84070500dbdd9b4cc1e2b1a7d125964739e81 /src/core/SkCanvas.cpp | |
| parent | c4e87724920222a218f31b22612efc5b1ec0ed6c (diff) | |
Rename SkCanvasDrawable to SkDrawable, and make public
(patchset #2 id:20001 of https://codereview.chromium.org/903993002/)"
This reverts commit c4e87724920222a218f31b22612efc5b1ec0ed6c.
BUG=skia:
TBR=
NOTREECHECKS=True
Review URL: https://codereview.chromium.org/898343004
Diffstat (limited to 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 055e6737a6..ce99546728 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); } |