SkCanvas: remove unused SkCanvas::InitFlags
Change-Id: Ib5a0a873ebe6a3c8c671afc1e9f7f102cfee4aa7
Reviewed-on: https://skia-review.googlesource.com/c/159580
Commit-Queue: Hal Canary <halcanary@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index f370e20..11f5372 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -32,7 +32,6 @@
class SkAndroidFrameworkUtils;
class SkBaseDevice;
class SkBitmap;
-class SkClipStack;
class SkData;
class SkDraw;
class SkDrawable;
@@ -44,7 +43,6 @@
class SkPath;
class SkPicture;
class SkPixmap;
-class SkRasterClip;
class SkRegion;
class SkRRect;
struct SkRSXform;
@@ -2592,21 +2590,15 @@
friend class AutoDrawLooper;
friend class SkDebugCanvas; // needs experimental fAllowSimplifyClip
friend class SkSurface_Raster; // needs getDevice()
- friend class SkNoDrawCanvas; // InitFlags
- friend class SkPictureImageFilter; // SkCanvas(SkBaseDevice*, SkSurfaceProps*, InitFlags)
+ friend class SkNoDrawCanvas; // needs resetForNextPicture()
friend class SkPictureRecord; // predrawNotify (why does it need it? <reed>)
friend class SkOverdrawCanvas;
friend class SkRasterHandleAllocator;
- enum InitFlags {
- kDefault_InitFlags = 0,
- kConservativeRasterClip_InitFlag = 1 << 0,
- };
protected:
// For use by SkNoDrawCanvas (via SkCanvasVirtualEnforcer, which can't be a friend)
- SkCanvas(const SkIRect& bounds, InitFlags);
+ SkCanvas(const SkIRect& bounds);
private:
- SkCanvas(sk_sp<SkBaseDevice> device, InitFlags);
SkCanvas(const SkBitmap&, std::unique_ptr<SkRasterHandleAllocator>,
SkRasterHandleAllocator::Handle);
@@ -2625,7 +2617,7 @@
// - internalSaveLayer
void setupDevice(SkBaseDevice*);
- void init(sk_sp<SkBaseDevice>, InitFlags);
+ void init(sk_sp<SkBaseDevice>);
/**
* Gets the bounds of the top level layer in global canvas coordinates. We don't want this
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index efdead1..380195f 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -541,11 +541,7 @@
fIsScaleTranslate = true;
}
-void SkCanvas::init(sk_sp<SkBaseDevice> device, InitFlags flags) {
- if (device && device->forceConservativeRasterClip()) {
- flags = InitFlags(flags | kConservativeRasterClip_InitFlag);
- }
-
+void SkCanvas::init(sk_sp<SkBaseDevice> device) {
fAllowSimplifyClip = false;
fSaveCount = 1;
fMetaData = nullptr;
@@ -581,7 +577,7 @@
{
inc_canvas();
- this->init(nullptr, kDefault_InitFlags);
+ this->init(nullptr);
}
SkCanvas::SkCanvas(int width, int height, const SkSurfaceProps* props)
@@ -590,17 +586,17 @@
{
inc_canvas();
this->init(sk_make_sp<SkNoPixelsDevice>(
- SkIRect::MakeWH(SkTMax(width, 0), SkTMax(height, 0)), fProps), kDefault_InitFlags);
+ SkIRect::MakeWH(SkTMax(width, 0), SkTMax(height, 0)), fProps));
}
-SkCanvas::SkCanvas(const SkIRect& bounds, InitFlags flags)
+SkCanvas::SkCanvas(const SkIRect& bounds)
: fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
, fProps(SkSurfaceProps::kLegacyFontHost_InitType)
{
inc_canvas();
SkIRect r = bounds.isEmpty() ? SkIRect::MakeEmpty() : bounds;
- this->init(sk_make_sp<SkNoPixelsDevice>(r, fProps), flags);
+ this->init(sk_make_sp<SkNoPixelsDevice>(r, fProps));
}
SkCanvas::SkCanvas(sk_sp<SkBaseDevice> device)
@@ -609,16 +605,7 @@
{
inc_canvas();
- this->init(device, kDefault_InitFlags);
-}
-
-SkCanvas::SkCanvas(sk_sp<SkBaseDevice> device, InitFlags flags)
- : fMCStack(sizeof(MCRec), fMCRecStorage, sizeof(fMCRecStorage))
- , fProps(device->surfaceProps())
-{
- inc_canvas();
-
- this->init(device, flags);
+ this->init(device);
}
SkCanvas::SkCanvas(const SkBitmap& bitmap, const SkSurfaceProps& props)
@@ -628,7 +615,7 @@
inc_canvas();
sk_sp<SkBaseDevice> device(new SkBitmapDevice(bitmap, fProps, nullptr, nullptr));
- this->init(device, kDefault_InitFlags);
+ this->init(device);
}
SkCanvas::SkCanvas(const SkBitmap& bitmap, std::unique_ptr<SkRasterHandleAllocator> alloc,
@@ -640,7 +627,7 @@
inc_canvas();
sk_sp<SkBaseDevice> device(new SkBitmapDevice(bitmap, fProps, hndl, nullptr));
- this->init(device, kDefault_InitFlags);
+ this->init(device);
}
SkCanvas::SkCanvas(const SkBitmap& bitmap) : SkCanvas(bitmap, nullptr, nullptr) {}
@@ -656,7 +643,7 @@
SkBitmap tmp(bitmap);
*const_cast<SkImageInfo*>(&tmp.info()) = tmp.info().makeColorSpace(nullptr);
sk_sp<SkBaseDevice> device(new SkBitmapDevice(tmp, fProps, nullptr, nullptr));
- this->init(device, kDefault_InitFlags);
+ this->init(device);
}
#endif
@@ -2859,10 +2846,10 @@
///////////////////////////////////////////////////////////////////////////////
SkNoDrawCanvas::SkNoDrawCanvas(int width, int height)
- : INHERITED(SkIRect::MakeWH(width, height), kConservativeRasterClip_InitFlag) {}
+ : INHERITED(SkIRect::MakeWH(width, height)) {}
SkNoDrawCanvas::SkNoDrawCanvas(const SkIRect& bounds)
- : INHERITED(bounds, kConservativeRasterClip_InitFlag) {}
+ : INHERITED(bounds) {}
SkNoDrawCanvas::SkNoDrawCanvas(sk_sp<SkBaseDevice> device)
: INHERITED(device) {}
diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
index 57894c2..9bcd90a 100644
--- a/src/image/SkSurface_Gpu.cpp
+++ b/src/image/SkSurface_Gpu.cpp
@@ -72,12 +72,7 @@
return rt->getBackendRenderTarget();
}
-SkCanvas* SkSurface_Gpu::onNewCanvas() {
- SkCanvas::InitFlags flags = SkCanvas::kDefault_InitFlags;
- flags = static_cast<SkCanvas::InitFlags>(flags | SkCanvas::kConservativeRasterClip_InitFlag);
-
- return new SkCanvas(fDevice, flags);
-}
+SkCanvas* SkSurface_Gpu::onNewCanvas() { return new SkCanvas(fDevice); }
sk_sp<SkSurface> SkSurface_Gpu::onNewSurface(const SkImageInfo& info) {
int sampleCount = fDevice->accessRenderTargetContext()->numColorSamples();