diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 13:49:31 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-22 13:49:31 +0000 |
| commit | 41eb22af5f8ad3696ced92b4612286699795a6d4 (patch) | |
| tree | 888e22056463a7a4f9f4bc9c83db7d3f88a1a20e /skia/ext | |
| parent | 8672bbf8386f2f44af760194dcc7a65c5373b596 (diff) | |
| download | chromium_src-41eb22af5f8ad3696ced92b4612286699795a6d4.zip chromium_src-41eb22af5f8ad3696ced92b4612286699795a6d4.tar.gz chromium_src-41eb22af5f8ad3696ced92b4612286699795a6d4.tar.bz2 | |
Roll Skia DEPS to r11890
R=bsalomon@google.com, danakj@chromium.org
Review URL: https://codereview.chromium.org/33433002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext')
| -rw-r--r-- | skia/ext/lazy_pixel_ref_utils_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/skia/ext/lazy_pixel_ref_utils_unittest.cc b/skia/ext/lazy_pixel_ref_utils_unittest.cc index c3a2e27..0546133 100644 --- a/skia/ext/lazy_pixel_ref_utils_unittest.cc +++ b/skia/ext/lazy_pixel_ref_utils_unittest.cc @@ -29,7 +29,7 @@ class TestPixelRef : public SkPixelRef { TestPixelRef(int width, int height); virtual ~TestPixelRef(); - virtual SkFlattenable::Factory getFactory() OVERRIDE; + virtual SkFlattenable::Factory getFactory() const OVERRIDE; virtual void* onLockPixels(SkColorTable** color_table) OVERRIDE; virtual void onUnlockPixels() OVERRIDE {} virtual SkPixelRef* deepCopy(SkBitmap::Config config, const SkIRect* subset) @@ -44,7 +44,7 @@ class TestLazyPixelRef : public skia::LazyPixelRef { TestLazyPixelRef(int width, int height); virtual ~TestLazyPixelRef(); - virtual SkFlattenable::Factory getFactory() OVERRIDE; + virtual SkFlattenable::Factory getFactory() const OVERRIDE; virtual void* onLockPixels(SkColorTable** color_table) OVERRIDE; virtual void onUnlockPixels() OVERRIDE {} virtual bool PrepareToDecode(const PrepareParams& params) OVERRIDE; @@ -94,7 +94,7 @@ TestPixelRef::TestPixelRef(int width, int height) TestPixelRef::~TestPixelRef() {} -SkFlattenable::Factory TestPixelRef::getFactory() { return NULL; } +SkFlattenable::Factory TestPixelRef::getFactory() const { return NULL; } void* TestPixelRef::onLockPixels(SkColorTable** color_table) { return pixels_.get(); @@ -111,7 +111,7 @@ TestLazyPixelRef::TestLazyPixelRef(int width, int height) TestLazyPixelRef::~TestLazyPixelRef() {} -SkFlattenable::Factory TestLazyPixelRef::getFactory() { return NULL; } +SkFlattenable::Factory TestLazyPixelRef::getFactory() const { return NULL; } void* TestLazyPixelRef::onLockPixels(SkColorTable** color_table) { return pixels_.get(); |