diff options
author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 18:57:39 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-20 18:59:21 +0000 |
commit | a173ebbacb4a20ee80c891bed1eea9de605029a9 (patch) | |
tree | 9a45fe1781dfd3219428a12e0d5f24a16fb394d7 /skia | |
parent | 956aef2aa8fa3b6caa6ef8f0c18444942c4117fb (diff) | |
download | chromium_src-a173ebbacb4a20ee80c891bed1eea9de605029a9.zip chromium_src-a173ebbacb4a20ee80c891bed1eea9de605029a9.tar.gz chromium_src-a173ebbacb4a20ee80c891bed1eea9de605029a9.tar.bz2 |
tweak TestDiscardableShader in preparation for big flattening change from skia
skia CL: https://codereview.chromium.org/395603002
android_chromium_gn... build failure looks unrelated
NOTRY=True
Review URL: https://codereview.chromium.org/477923007
Cr-Commit-Position: refs/heads/master@{#290879}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r-- | skia/ext/pixel_ref_utils_unittest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/skia/ext/pixel_ref_utils_unittest.cc b/skia/ext/pixel_ref_utils_unittest.cc index 10d8bbf..92c62d7 100644 --- a/skia/ext/pixel_ref_utils_unittest.cc +++ b/skia/ext/pixel_ref_utils_unittest.cc @@ -30,7 +30,7 @@ class TestDiscardableShader : public SkShader { CreateBitmap(gfx::Size(50, 50), "discardable", &bitmap_); } - TestDiscardableShader(SkReadBuffer& buffer) : SkShader(buffer) { + TestDiscardableShader(SkReadBuffer& buffer) { CreateBitmap(gfx::Size(50, 50), "discardable", &bitmap_); } @@ -47,12 +47,20 @@ class TestDiscardableShader : public SkShader { return sizeof(SkShader::Context); } + virtual void flatten(SkWriteBuffer&) const OVERRIDE {} + SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestDiscardableShader); private: SkBitmap bitmap_; }; +#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING +SkFlattenable* TestDiscardableShader::CreateProc(SkReadBuffer&) { + return new TestDiscardableShader; +} +#endif + void CreateBitmap(gfx::Size size, const char* uri, SkBitmap* bitmap) { bitmap->allocN32Pixels(size.width(), size.height()); bitmap->pixelRef()->setImmutable(); |