diff options
| author | lushnikov <lushnikov@chromium.org> | 2014-09-04 07:30:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 14:32:07 +0000 |
| commit | c6df10449518e58f647ea40f5907041bb54639f8 (patch) | |
| tree | d89a68c403f038aaedd70e30657d86889b22b2bb | |
| parent | eb5f8ef3d692e2a9fb6ad6837426da2b9e2c0ee9 (diff) | |
| download | chromium_src-c6df10449518e58f647ea40f5907041bb54639f8.zip chromium_src-c6df10449518e58f647ea40f5907041bb54639f8.tar.gz chromium_src-c6df10449518e58f647ea40f5907041bb54639f8.tar.bz2 | |
Revert of Try backing SkPicture with SkRecord in Chromium. (patchset #4 id:60001 of https://codereview.chromium.org/504823003/)
Reason for revert:
This patch broke icons in Developer Tools: crbug.com/410847
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=408985,409110
>
> Committed: https://chromium.googlesource.com/chromium/src/+/f7450daaf38f4951b23fabaaaf659c6af33a705c
>
> Committed: https://chromium.googlesource.com/chromium/src/+/5f2a6ab31313eb2fc6e456f65c3863a77d2d0c30
>
> CQ_EXTRA_TRYBOTS=tryserver.blink:linux_blink_rel,linux_blink_dbg;tryserver.chromium.linux:linux_browser_asan
>
> Committed: https://chromium.googlesource.com/chromium/src/+/130033d6c732af90ed117f05517e4efffd23ae58
TBR=reed@google.com,mtklein@google.com,senorblanco@chromium.org,eroman@chromium.org,fmalita@chromium.org,mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=408985,409110
Review URL: https://codereview.chromium.org/544643002
Cr-Commit-Position: refs/heads/master@{#293296}
| -rw-r--r-- | skia/config/SkUserConfig.h | 11 | ||||
| -rw-r--r-- | skia/skia_test_expectations.txt | 3 |
2 files changed, 4 insertions, 10 deletions
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index 78dd445..cc83655 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 <SkPreConfig.h> @@ -261,13 +265,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal, #define SK_SUPPORT_LEGACY_ALLOCPIXELS_BOOL #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 diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index d0e0e57..4327f6e 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -48,7 +48,4 @@ # # START OVERRIDES HERE -# SkRecord records translates as setMatrix, requiring an update to test expectations. -crbug.com/408985 inspector/layers/layer-canvas-log.html [ Failure Pass ] - # END OVERRIDES HERE (this line ensures that the file is newline-terminated) |