diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 17:49:04 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-20 17:49:04 +0000 |
| commit | 3055b700189afdd02486ed8f2279cea1d8897243 (patch) | |
| tree | a66e6ce6e9717464dd67eb206f76440da9bab059 /src/device | |
| parent | 4eaa6647e70c9404d1c920f674d706ca2d2a76b9 (diff) | |
Split SkDevice out of SkBitmapDevice
https://codereview.chromium.org/22978012/
git-svn-id: http://skia.googlecode.com/svn/trunk@10830 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/xps/SkXPSDevice.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/device/xps/SkXPSDevice.cpp b/src/device/xps/SkXPSDevice.cpp index 442a51f507..311c09f425 100644 --- a/src/device/xps/SkXPSDevice.cpp +++ b/src/device/xps/SkXPSDevice.cpp @@ -111,7 +111,7 @@ static SkBitmap make_fake_bitmap(int width, int height) { } SkXPSDevice::SkXPSDevice() - : SkDevice(make_fake_bitmap(10000, 10000)) + : SkBitmapDevice(make_fake_bitmap(10000, 10000)) , fCurrentPage(0) { } @@ -2375,7 +2375,7 @@ void SkXPSDevice::drawTextOnPath(const SkDraw& d, const void* text, size_t len, d.drawTextOnPath((const char*)text, len, path, matrix, paint); } -void SkXPSDevice::drawDevice(const SkDraw& d, SkDevice* dev, +void SkXPSDevice::drawDevice(const SkDraw& d, SkBaseDevice* dev, int x, int y, const SkPaint&) { SkXPSDevice* that = static_cast<SkXPSDevice*>(dev); @@ -2407,11 +2407,11 @@ bool SkXPSDevice::onReadPixels(const SkBitmap& bitmap, int x, int y, return false; } -SkDevice* SkXPSDevice::onCreateCompatibleDevice(SkBitmap::Config config, - int width, int height, - bool isOpaque, - Usage usage) { - if (SkDevice::kGeneral_Usage == usage) { +SkBaseDevice* SkXPSDevice::onCreateCompatibleDevice(SkBitmap::Config config, + int width, int height, + bool isOpaque, + Usage usage) { + if (SkBaseDevice::kGeneral_Usage == usage) { return NULL; SK_CRASH(); //To what stream do we write? @@ -2425,7 +2425,7 @@ SkDevice* SkXPSDevice::onCreateCompatibleDevice(SkBitmap::Config config, } SkXPSDevice::SkXPSDevice(IXpsOMObjectFactory* xpsFactory) - : SkDevice(make_fake_bitmap(10000, 10000)) + : SkBitmapDevice(make_fake_bitmap(10000, 10000)) , fCurrentPage(0) { HRVM(CoCreateInstance( |