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/pdf | |
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/pdf')
-rw-r--r-- | src/pdf/SkPDFDevice.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 02dda02451..a24c4ecd8a 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -566,10 +566,10 @@ void GraphicStackState::updateDrawingState(const GraphicStateEntry& state) { } } -SkBaseDevice* SkPDFDevice::onCreateCompatibleDevice(SkBitmap::Config config, - int width, int height, - bool isOpaque, - Usage usage) { +SkDevice* SkPDFDevice::onCreateCompatibleDevice(SkBitmap::Config config, + int width, int height, + bool isOpaque, + Usage usage) { SkMatrix initialTransform; initialTransform.reset(); SkISize size = SkISize::Make(width, height); @@ -672,7 +672,7 @@ static inline SkBitmap makeContentBitmap(const SkISize& contentSize, // TODO(vandebo) change pageSize to SkSize. SkPDFDevice::SkPDFDevice(const SkISize& pageSize, const SkISize& contentSize, const SkMatrix& initialTransform) - : SkBitmapDevice(makeContentBitmap(contentSize, &initialTransform)), + : SkDevice(makeContentBitmap(contentSize, &initialTransform)), fPageSize(pageSize), fContentSize(contentSize), fLastContentEntry(NULL), @@ -696,7 +696,7 @@ SkPDFDevice::SkPDFDevice(const SkISize& pageSize, const SkISize& contentSize, SkPDFDevice::SkPDFDevice(const SkISize& layerSize, const SkClipStack& existingClipStack, const SkRegion& existingClipRegion) - : SkBitmapDevice(makeContentBitmap(layerSize, NULL)), + : SkDevice(makeContentBitmap(layerSize, NULL)), fPageSize(layerSize), fContentSize(layerSize), fExistingClipStack(existingClipStack), @@ -1153,11 +1153,11 @@ void SkPDFDevice::drawVertices(const SkDraw& d, SkCanvas::VertexMode, NOT_IMPLEMENTED("drawVerticies", true); } -void SkPDFDevice::drawDevice(const SkDraw& d, SkBaseDevice* device, int x, int y, +void SkPDFDevice::drawDevice(const SkDraw& d, SkDevice* device, int x, int y, const SkPaint& paint) { if ((device->getDeviceCapabilities() & kVector_Capability) == 0) { // If we somehow get a raster device, do what our parent would do. - INHERITED::drawDevice(d, device, x, y, paint); + SkDevice::drawDevice(d, device, x, y, paint); return; } |