diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 15:24:26 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-17 15:24:26 +0000 |
| commit | 403f8d7a052269583175e945689824838e5e0ef4 (patch) | |
| tree | 2bb79de252c2188e28fb7a612561143e1dfcc3e0 /src/core | |
| parent | 93f5e5162137553c5fb81f69fa682a5dfe7eaef1 (diff) | |
still trying to kill setDevice: rename to setRootDevice (better name) and make private
BUG=skia:
COLLABORATOR=reed@google.com
R=bsalomon@google.com, scroggo@google.com, reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/169023002
git-svn-id: http://skia.googlecode.com/svn/trunk@13476 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkCanvas.cpp | 4 | ||||
| -rw-r--r-- | src/core/SkPictureRecord.cpp | 5 | ||||
| -rw-r--r-- | src/core/SkPictureRecord.h | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index cffc46aed8..4462b4cc2a 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -501,7 +501,7 @@ SkBaseDevice* SkCanvas::init(SkBaseDevice* device) { fSurfaceBase = NULL; - return this->setDevice(device); + return this->setRootDevice(device); } SkCanvas::SkCanvas() @@ -602,7 +602,7 @@ SkBaseDevice* SkCanvas::getTopDevice(bool updateMatrixClip) const { return fMCRec->fTopLayer->fDevice; } -SkBaseDevice* SkCanvas::setDevice(SkBaseDevice* device) { +SkBaseDevice* SkCanvas::setRootDevice(SkBaseDevice* device) { // return root device SkDeque::F2BIter iter(fMCStack); MCRec* rec = (MCRec*)iter.next(); diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp index 042e6a39cb..babf1e47f1 100644 --- a/src/core/SkPictureRecord.cpp +++ b/src/core/SkPictureRecord.cpp @@ -139,11 +139,6 @@ static inline uint32_t getPaintOffset(DrawType op, uint32_t opSize) { return gPaintOffsets[op] * sizeof(uint32_t) + overflow; } -SkBaseDevice* SkPictureRecord::setDevice(SkBaseDevice* device) { - SkDEBUGFAIL("eeek, don't try to change the device on a recording canvas"); - return this->INHERITED::setDevice(device); -} - int SkPictureRecord::save(SaveFlags flags) { #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h index eaa5e73008..5e37f81c6b 100644 --- a/src/core/SkPictureRecord.h +++ b/src/core/SkPictureRecord.h @@ -36,8 +36,6 @@ public: SkPictureRecord(uint32_t recordFlags, SkBaseDevice*); virtual ~SkPictureRecord(); - virtual SkBaseDevice* setDevice(SkBaseDevice* device) SK_OVERRIDE; - virtual int save(SaveFlags) SK_OVERRIDE; virtual int saveLayer(const SkRect* bounds, const SkPaint*, SaveFlags) SK_OVERRIDE; virtual void restore() SK_OVERRIDE; |