diff options
| author |  robertphillips <robertphillips@google.com> | 2015-06-22 09:46:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-22 09:46:59 -0700 |
| commit | 9a53fd7c41554630124522f4b6eedc16912abbb7 (patch) | |
| tree | 20550e4369717dfa1082ba4913a4dc646d040b5e /src/pipe | |
| parent | 462a33c7ac6ad82ac3511884d6448491e9e9a647 (diff) | |
Begin kLegacyFontHost_InitType cleanup
This CL starts the process of pushing kLegacyFontHost_InitType-type SkSurfaceProps up the call stack and out of Skia. It:
Gets rid of the default SkBaseDevice ctor. This means everyone has to always hand an explicit SkSurfaceProps to it.
It makes public the SkBitmapDevice creation methods that require SkSurfaceProps.
Removes (in Skia's code base) all SkBitmapDevice ctor calls w/o SkSurfaceProps.
Makes the "recording" canvases (e.g., pdf, svg, xps) explicitly not use kLegacyFontHost_InitType.
Replicates the creating canvas/device's flags on saveLayer devices
BUG=skia:3934
Review URL: https://codereview.chromium.org/1204433002
Diffstat (limited to 'src/pipe')
| -rw-r--r-- | src/pipe/SkGPipeWrite.cpp | 1 | ||||
| -rw-r--r-- | src/pipe/utils/SamplePipeControllers.cpp | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp index 9fd81b05eb..2c11c41444 100644 --- a/src/pipe/SkGPipeWrite.cpp +++ b/src/pipe/SkGPipeWrite.cpp @@ -7,7 +7,6 @@ */ #include "SkAnnotation.h" -#include "SkBitmapDevice.h" #include "SkBitmapHeap.h" #include "SkCanvas.h" #include "SkColorFilter.h" diff --git a/src/pipe/utils/SamplePipeControllers.cpp b/src/pipe/utils/SamplePipeControllers.cpp index ea2c39cff0..b85ceb6790 100644 --- a/src/pipe/utils/SamplePipeControllers.cpp +++ b/src/pipe/utils/SamplePipeControllers.cpp @@ -7,7 +7,6 @@ #include "SamplePipeControllers.h" -#include "SkBitmapDevice.h" #include "SkCanvas.h" #include "SkGPipe.h" #include "SkMatrix.h" @@ -55,9 +54,7 @@ TiledPipeController::TiledPipeController(const SkBitmap& bitmap, SkDEBUGCODE(bool extracted = )bitmap.extractSubset(&fBitmaps[i], rect); SkASSERT(extracted); - SkBaseDevice* device = new SkBitmapDevice(fBitmaps[i]); - SkCanvas* canvas = new SkCanvas(device); - device->unref(); + SkCanvas* canvas = new SkCanvas(fBitmaps[i]); if (initial != NULL) { canvas->setMatrix(*initial); } |