From 0e040f7da2fdfeb49aa60d24117306e3b1e6ea90 Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 13 Mar 2015 07:28:28 -0700 Subject: Revert of Change device creation to see the (optional) layer-paint (patchset #9 id:160001 of https://codereview.chromium.org/988413003/) Reason for revert: need to have chrome opt-in for the older API before this can land (in chrome) Original issue's description: > Change device creation to see the (optional) layer-paint > > Motivation: > > PDFDevice currently relies on 1) being told that the layer's paint has an imagefilter, and in the case, it creates a rasterdevice. It then relies on (2) canvas itself sniffing the layer's paint and offering to apply-the-imagefilter to call drawSprite instead of drawDevice. > > This subtle interchange is fragile, and also does not support other unsupported PDF features like colorfilters. This CL is a step toward making this use-raster-instead-of-native approach to layers more completely in the subclass' hands. > > Committed: https://skia.googlesource.com/skia/+/1182d9a96b80bd12183ee7c81325a979a51ee0c0 TBR=halcanary@google.com,senorblanco@google.com,robertphillips@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1008863002 --- src/pdf/SkPDFDevice.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/pdf/SkPDFDevice.h') diff --git a/src/pdf/SkPDFDevice.h b/src/pdf/SkPDFDevice.h index a90ea115c1..8a88314009 100644 --- a/src/pdf/SkPDFDevice.h +++ b/src/pdf/SkPDFDevice.h @@ -235,7 +235,8 @@ private: ContentEntry* getLastContentEntry(); void setLastContentEntry(ContentEntry* contentEntry); - SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) SK_OVERRIDE; + // override from SkBaseDevice + SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE; void init(); void cleanUp(bool clearFontUsage); -- cgit v1.2.3