From fe5226eee8343a325c6b4d5d0e75f94c96c4616e Mon Sep 17 00:00:00 2001 From: mlamouri Date: Fri, 29 Aug 2014 02:31:27 -0700 Subject: [PATCH] Revert of Try backing SkPicture with SkRecord in Chromium. (patchset #2 of https://codereview.chromium.org/504823003/) Reason for revert: This is breaking the following Blink test: inspector/layers/layer-canvas-log.html Original issue's description: > Try backing SkPicture with SkRecord in Chromium. > > This is our first attempt, mostly to feel this out. Performance and > correctness problems are both possible. Please revert this if a benchmark even > smells funny. > > That said, we've been working on this a while, are pretty confident it's good > stuff, and have had Skia's internal testing entirely switched over for a week. > Parts of Chromium that serialize and deserialize SkPictures are already > switched over. This CL finishes things off by switching the default > recorded-from-scratch SkPicture to use SkRecord too. > > BUG= > > Committed: https://chromium.googlesource.com/chromium/src/+/f7450daaf38f4951b23fabaaaf659c6af33a705c > > Committed: https://chromium.googlesource.com/chromium/src/+/5f2a6ab31313eb2fc6e456f65c3863a77d2d0c30 TBR=reed@google.com,mtklein@google.com,senorblanco@chromium.org,eroman@chromium.org,mtklein@chromium.org NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/522623002 Cr-Commit-Position: refs/heads/master@{#292598} --- skia/config/SkUserConfig.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index 607616d80fcef9..5cdbd6ac598cd5 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -17,6 +17,10 @@ #ifndef SkUserConfig_DEFINED #define SkUserConfig_DEFINED +// Turns SkPicture::clone() into a simple "return SkRef(this);" as a way to +// test the threadsafety of SkPicture playback. +#define SK_PICTURE_CLONE_NOOP 1 + /* SkTypes.h, the root of the public header files, does the following trick: #include @@ -257,13 +261,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal, #define SK_SUPPORT_LEGACY_GETDEVICE #endif -// Turns SkPicture::clone() into a simple "return SkRef(this);" as a way to -// test the threadsafety of SkPicture playback. -#define SK_PICTURE_CLONE_NOOP 1 - -// Turns on new (nicer, hopefully faster) SkPicture backend. -#define SK_PICTURE_USE_SK_RECORD 1 - // ===== End Chrome-specific definitions ===== #endif