enable conservative raster clipping
There may be other (better?) ways to enable this. For example, if we queried the device *before* we init our root DeviceCM, we wouldn't need this flag in InitFlags, since the device already has a virtual to opt-in ...
BUG=skia:
Review URL: https://codereview.chromium.org/1458153003
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 3e8f362..53f6dda 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1436,7 +1436,7 @@
mutable bool fCachedLocalClipBoundsDirty;
bool fAllowSoftClip;
bool fAllowSimplifyClip;
- bool fConservativeRasterClip;
+ const bool fConservativeRasterClip;
const SkRect& getLocalClipBounds() const {
if (fCachedLocalClipBoundsDirty) {
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 7d71ffb..895d36f 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -627,7 +627,13 @@
}
SkBaseDevice* SkCanvas::init(SkBaseDevice* device, InitFlags flags) {
- fConservativeRasterClip = SkToBool(flags & kConservativeRasterClip_InitFlag);
+ if (device && device->forceConservativeRasterClip()) {
+ flags = InitFlags(flags | kConservativeRasterClip_InitFlag);
+ }
+ // Since init() is only called once by our constructors, it is safe to perform this
+ // const-cast.
+ *const_cast<bool*>(&fConservativeRasterClip) = SkToBool(flags & kConservativeRasterClip_InitFlag);
+
fCachedLocalClipBounds.setEmpty();
fCachedLocalClipBoundsDirty = true;
fAllowSoftClip = true;
@@ -652,9 +658,6 @@
if (device) {
// The root device and the canvas should always have the same pixel geometry
SkASSERT(fProps.pixelGeometry() == device->surfaceProps().pixelGeometry());
- if (device->forceConservativeRasterClip()) {
- fConservativeRasterClip = true;
- }
device->onAttachToCanvas(this);
fMCRec->fLayer->fDevice = SkRef(device);
fMCRec->fRasterClip.setRect(device->getGlobalBounds());
@@ -665,6 +668,7 @@
SkCanvas::SkCanvas()
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
, fProps(SkSurfaceProps::kLegacyFontHost_InitType)
+ , fConservativeRasterClip(false)
{
inc_canvas();
@@ -693,6 +697,7 @@
SkCanvas::SkCanvas(int width, int height, const SkSurfaceProps* props)
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
, fProps(SkSurfacePropsCopyOrDefault(props))
+ , fConservativeRasterClip(false)
{
inc_canvas();
@@ -703,6 +708,7 @@
SkCanvas::SkCanvas(const SkIRect& bounds, InitFlags flags)
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
, fProps(SkSurfaceProps::kLegacyFontHost_InitType)
+ , fConservativeRasterClip(false)
{
inc_canvas();
@@ -712,6 +718,7 @@
SkCanvas::SkCanvas(SkBaseDevice* device)
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
, fProps(device->surfaceProps())
+ , fConservativeRasterClip(false)
{
inc_canvas();
@@ -721,6 +728,7 @@
SkCanvas::SkCanvas(SkBaseDevice* device, InitFlags flags)
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
, fProps(device->surfaceProps())
+ , fConservativeRasterClip(false)
{
inc_canvas();
@@ -730,6 +738,7 @@
SkCanvas::SkCanvas(const SkBitmap& bitmap, const SkSurfaceProps& props)
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
, fProps(props)
+ , fConservativeRasterClip(false)
{
inc_canvas();
@@ -740,6 +749,7 @@
SkCanvas::SkCanvas(const SkBitmap& bitmap)
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
, fProps(SkSurfaceProps::kLegacyFontHost_InitType)
+ , fConservativeRasterClip(false)
{
inc_canvas();