aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-07-13 13:27:16 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-07-13 13:27:16 -0700
commitdda54455a20dcd89de610bdb80e4a8e9137b80a4 (patch)
tree5c578a4207775bb102080fb304802ec43926de36 /include/core
parente92badc3ffce83668f76fcfa33a49784346cab1e (diff)
Remove GrLayerHoister
This relies on https://codereview.chromium.org/1944013002/ (Add legacy flag to allow Skia to remove Ganesh layer hoister) landing first so as to not break the DEPS roll. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1950523002 Review-Url: https://codereview.chromium.org/1950523002
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkDevice.h13
-rw-r--r--include/core/SkPictureRecorder.h4
2 files changed, 2 insertions, 15 deletions
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index d23aa6916f..d7361a2565 100644
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -310,19 +310,6 @@ protected:
virtual bool onAccessPixels(SkPixmap*) { return false; }
- /**
- * PRIVATE / EXPERIMENTAL -- do not call
- * This entry point gives the backend an opportunity to take over the rendering
- * of 'picture'. If optimization data is available (due to an earlier
- * 'optimize' call) this entry point should make use of it and return true
- * if all rendering has been done. If false is returned, SkCanvas will
- * perform its own rendering pass. It is acceptable for the backend
- * to perform some device-specific warm up tasks and then let SkCanvas
- * perform the main rendering loop (by return false from here).
- */
- virtual bool EXPERIMENTAL_drawPicture(SkCanvas*, const SkPicture*, const SkMatrix*,
- const SkPaint*);
-
struct CreateInfo {
static SkPixelGeometry AdjustGeometry(const SkImageInfo&, TileUsage, SkPixelGeometry,
bool preserveLCDText);
diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h
index 419c01bc88..cc30be19da 100644
--- a/include/core/SkPictureRecorder.h
+++ b/include/core/SkPictureRecorder.h
@@ -31,9 +31,9 @@ public:
~SkPictureRecorder();
enum RecordFlags {
- // This flag indicates that, if some BHH is being computed, saveLayer
- // information should also be extracted at the same time.
+#ifdef SK_SUPPORT_LEGACY_COMPUTESAVELAYER_FLAG
kComputeSaveLayerInfo_RecordFlag = 1 << 0,
+#endif
// If you call drawPicture() or drawDrawable() on the recording canvas, this flag forces
// that object to playback its contents immediately rather than reffing the object.