rename filterTextFlags to disableLCD
Under the hood, add SkPixelGeometry to the CreateInfo for new devices, allowing them to see their geometry (SkDeviceProperties) up front, rather than having it changed later.
The only exception is for devices that are used on the root-layer, where we don't see the device until after the fact (at least as long as we allow clients to attach a device to a canvas externally).
We also filter the geometry when we're creating a layer, so we can disable LCD text automatically if the layer is not marked as opaque.
NOTRY=True
-- gammatext flake?
Review URL: https://codereview.chromium.org/719253002
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index ead844f..82d4816 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -405,10 +405,6 @@
////////////////////////////////////////////////////////////////////////////
-void SkCanvas::setupDevice(SkBaseDevice* device) {
- device->setPixelGeometry(fProps.pixelGeometry());
-}
-
SkBaseDevice* SkCanvas::init(SkBaseDevice* device, InitFlags flags) {
fConservativeRasterClip = SkToBool(flags & kConservativeRasterClip_InitFlag);
fCachedLocalClipBounds.setEmpty();
@@ -429,7 +425,7 @@
fSurfaceBase = NULL;
if (device) {
- this->setupDevice(device);
+ device->initForRootLayer(fProps.pixelGeometry());
if (device->forceConservativeRasterClip()) {
fConservativeRasterClip = true;
}
@@ -601,6 +597,7 @@
if (device) {
device->onAttachToCanvas(this);
+ device->initForRootLayer(fProps.pixelGeometry());
}
if (rootDevice) {
rootDevice->onDetachFromCanvas();
@@ -608,7 +605,6 @@
SkRefCnt_SafeAssign(rec->fLayer->fDevice, device);
rootDevice = device;
- this->setupDevice(device);
fDeviceCMDirty = true;
@@ -931,20 +927,22 @@
SkImageInfo info = SkImageInfo::MakeN32(ir.width(), ir.height(),
isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
- SkBaseDevice* device;
- if (paint && paint->getImageFilter()) {
- device = this->getDevice();
- if (device) {
- device = device->createCompatibleDeviceForImageFilter(info);
- }
- } else {
- device = this->createLayerDevice(info);
+ SkBaseDevice* device = this->getTopDevice();
+ if (NULL == device) {
+ SkDebugf("Unable to find device for layer.");
+ return count;
}
+
+ SkBaseDevice::Usage usage = SkBaseDevice::kSaveLayer_Usage;
+ if (paint && paint->getImageFilter()) {
+ usage = SkBaseDevice::kImageFilter_Usage;
+ }
+ device = device->onCreateCompatibleDevice(SkBaseDevice::CreateInfo(info, usage,
+ fProps.pixelGeometry()));
if (NULL == device) {
SkDebugf("Unable to create device for layer.");
return count;
}
- this->setupDevice(device);
device->setOrigin(ir.fLeft, ir.fTop);
DeviceCM* layer = SkNEW_ARGS(DeviceCM,
@@ -1665,11 +1663,6 @@
return dev ? dev->accessRenderTarget() : NULL;
}
-SkBaseDevice* SkCanvas::createLayerDevice(const SkImageInfo& info) {
- SkBaseDevice* device = this->getTopDevice();
- return device ? device->createCompatibleDeviceForSaveLayer(info) : NULL;
-}
-
GrContext* SkCanvas::getGrContext() {
#if SK_SUPPORT_GPU
SkBaseDevice* device = this->getTopDevice();
@@ -2062,10 +2055,12 @@
class SkDeviceFilteredPaint {
public:
SkDeviceFilteredPaint(SkBaseDevice* device, const SkPaint& paint) {
- SkBaseDevice::TextFlags flags;
- if (device->filterTextFlags(paint, &flags)) {
+ if (device->shouldDisableLCD(paint)) {
+ uint32_t flags = paint.getFlags();
+ flags &= ~SkPaint::kLCDRenderText_Flag;
+ flags |= SkPaint::kGenA8FromLCD_Flag;
SkPaint* newPaint = fLazy.set(paint);
- newPaint->setFlags(flags.fFlags);
+ newPaint->setFlags(flags);
fPaint = newPaint;
} else {
fPaint = &paint;