diff options
author | 2015-06-22 12:06:08 -0700 | |
---|---|---|
committer | 2015-06-22 12:06:08 -0700 | |
commit | efbffedd68636e94d4379e84a2585bce80f6fb8f (patch) | |
tree | fbddc37d43f72b35701a73af6df9b0eee9298271 /src/core/SkCanvas.cpp | |
parent | 343c7d15c831a3c3d8a6984c1a1b524b414012df (diff) |
Clean up usage of SkSurfaceProps
This CL continues cleaning up Skia's usage of SkSurfaceProps. It:
Removes the duplicate SkSurfaceProps object from SkImageFilter::Proxy.
Removes a dispreferred ctor from SkCanvas
Removes the initForRootLayer entry point from SkDevice (since the root device and the canvas should always have the same pixel geometry now).
Review URL: https://codereview.chromium.org/1201983006
Diffstat (limited to 'src/core/SkCanvas.cpp')
-rw-r--r-- | src/core/SkCanvas.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index f35727d6f6..fcfb641407 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -536,8 +536,8 @@ SkBaseDevice* SkCanvas::init(SkBaseDevice* device, InitFlags flags) { fSurfaceBase = NULL; if (device) { - // TODO: remove this - the root device & canvas should always have same surfaceProps - device->initForRootLayer(fProps.pixelGeometry()); + // The root device and the canvas should always have the same pixel geometry + SkASSERT(fProps.pixelGeometry() == device->surfaceProps().pixelGeometry()); if (device->forceConservativeRasterClip()) { fConservativeRasterClip = true; } @@ -595,16 +595,6 @@ SkCanvas::SkCanvas(const SkIRect& bounds, InitFlags flags) this->init(SkNEW_ARGS(SkNoPixelsBitmapDevice, (bounds, fProps)), flags)->unref(); } -// TODO: remove this ctor -SkCanvas::SkCanvas(SkBaseDevice* device, const SkSurfaceProps* props, InitFlags flags) - : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage)) - , fProps(SkSurfacePropsCopyOrDefault(props)) -{ - inc_canvas(); - - this->init(device, flags); -} - SkCanvas::SkCanvas(SkBaseDevice* device) : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage)) , fProps(device->surfaceProps()) @@ -1256,7 +1246,7 @@ void SkCanvas::internalDrawDevice(SkBaseDevice* srcDev, int x, int y, SkImageFilter* filter = paint->getImageFilter(); SkIPoint pos = { x - iter.getX(), y - iter.getY() }; if (filter && !dstDev->canHandleImageFilter(filter)) { - SkImageFilter::Proxy proxy(dstDev, fProps); + SkImageFilter::Proxy proxy(dstDev); SkBitmap dst; SkIPoint offset = SkIPoint::Make(0, 0); const SkBitmap& src = srcDev->accessBitmap(false); @@ -1308,7 +1298,7 @@ void SkCanvas::onDrawSprite(const SkBitmap& bitmap, int x, int y, const SkPaint* SkImageFilter* filter = paint->getImageFilter(); SkIPoint pos = { x - iter.getX(), y - iter.getY() }; if (filter && !iter.fDevice->canHandleImageFilter(filter)) { - SkImageFilter::Proxy proxy(iter.fDevice, fProps); + SkImageFilter::Proxy proxy(iter.fDevice); SkBitmap dst; SkIPoint offset = SkIPoint::Make(0, 0); SkMatrix matrix = *iter.fMatrix; |