diff options
| author |  scroggo <scroggo@google.com> | 2015-02-19 18:44:58 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-19 18:44:58 -0800 |
| commit | 87fa631969e0bdbee3c0845aa2b9bf35b9b82eb0 (patch) | |
| tree | 72ddd7049f2dedcd5352bbd430a505ee65ece24c /tests/CachedDecodingPixelRefTest.cpp | |
| parent | 8974774c32b5f0365d375a81d5d047c5c2406614 (diff) | |
Rename onGetPixelsEnum back to onGetPixels.
Replace the old signature of onGetPixels (return bool) to return an
enum (Result). Remove onGetPixelsEnum.
Add a define for onGetPixelsEnum to onGetPixels. This is for staging
in Chromium, where some implementations override onGetPixelsEnum.
Add the define in skia_for_chromium_defines. Remove
SK_SUPPORT_LEGACY_IMAGE_GENERATOR_RETURN, which is no longer needed by
Chromium.
BUG=skia:3257
Review URL: https://codereview.chromium.org/939113002
Diffstat (limited to 'tests/CachedDecodingPixelRefTest.cpp')
| -rw-r--r-- | tests/CachedDecodingPixelRefTest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp index 51cb7ba38d..3882026c77 100644 --- a/tests/CachedDecodingPixelRefTest.cpp +++ b/tests/CachedDecodingPixelRefTest.cpp @@ -189,7 +189,7 @@ protected: return true; } - virtual Result onGetPixelsEnum(const SkImageInfo& info, void* pixels, size_t rowBytes, + virtual Result onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkPMColor ctable[], int* ctableCount) SK_OVERRIDE { REPORTER_ASSERT(fReporter, pixels != NULL); REPORTER_ASSERT(fReporter, rowBytes >= info.minRowBytes()); |