diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 20:06:40 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 20:06:40 +0000 |
| commit | 9b051a375ba6d6b61cea98f35834cd032aaa5347 (patch) | |
| tree | cea9d4aab32afcbbc193455a78a49b6d231e0a39 /src/core/SkPictureRecord.cpp | |
| parent | 8cee797901763ab0922eb9ef484cfdcbc94bee54 (diff) | |
Revert r10830 (Split SkDevice out of SkRasterDevice) until we can get Chromium ready.
git-svn-id: http://skia.googlecode.com/svn/trunk@10835 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkPictureRecord.cpp')
| -rw-r--r-- | src/core/SkPictureRecord.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp index ea1a40f731..0ec9eaf74d 100644 --- a/src/core/SkPictureRecord.cpp +++ b/src/core/SkPictureRecord.cpp @@ -28,7 +28,7 @@ static const uint32_t kSaveSize = 2 * kUInt32Size; static const uint32_t kSaveLayerNoBoundsSize = 4 * kUInt32Size; static const uint32_t kSaveLayerWithBoundsSize = 4 * kUInt32Size + sizeof(SkRect); -SkPictureRecord::SkPictureRecord(uint32_t flags, SkBaseDevice* device) : +SkPictureRecord::SkPictureRecord(uint32_t flags, SkDevice* device) : INHERITED(device), fBoundingHierarchy(NULL), fStateTree(NULL), @@ -138,7 +138,7 @@ static inline uint32_t getPaintOffset(DrawType op, uint32_t opSize) { return gPaintOffsets[op] * sizeof(uint32_t) + overflow; } -SkBaseDevice* SkPictureRecord::setDevice(SkBaseDevice* device) { +SkDevice* SkPictureRecord::setDevice(SkDevice* device) { SkASSERT(!"eeek, don't try to change the device on a recording canvas"); return this->INHERITED::setDevice(device); } |