diff options
author | 2013-10-31 16:24:08 +0000 | |
---|---|---|
committer | 2013-10-31 16:24:08 +0000 | |
commit | 081560e3abe25c4821b79ca1465f4dbd371c4b5c (patch) | |
tree | c6b87adb0a09e54eee77ba3363956738a1b7967f /src/effects/SkTransparentShader.cpp | |
parent | 94bdd7e3fcf493f827263bd922cb09fb4b50df4c (diff) |
add SK_ATTR_DEPRECATED -- will need to disable for chrome, since it triggers a warning
BUG=
R=robertphillips@google.com, senorblanco@chromium.org, vandebo@chromium.org
Review URL: https://codereview.chromium.org/51033004
git-svn-id: http://skia.googlecode.com/svn/trunk@12055 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkTransparentShader.cpp')
-rw-r--r-- | src/effects/SkTransparentShader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/SkTransparentShader.cpp b/src/effects/SkTransparentShader.cpp index 0274481623..970e74faa8 100644 --- a/src/effects/SkTransparentShader.cpp +++ b/src/effects/SkTransparentShader.cpp @@ -23,7 +23,7 @@ bool SkTransparentShader::setContext(const SkBitmap& device, uint32_t SkTransparentShader::getFlags() { uint32_t flags = this->INHERITED::getFlags(); - switch (fDevice->getConfig()) { + switch (fDevice->config()) { case SkBitmap::kRGB_565_Config: flags |= kHasSpan16_Flag; if (fAlpha == 255) @@ -42,7 +42,7 @@ uint32_t SkTransparentShader::getFlags() { void SkTransparentShader::shadeSpan(int x, int y, SkPMColor span[], int count) { unsigned scale = SkAlpha255To256(fAlpha); - switch (fDevice->getConfig()) { + switch (fDevice->config()) { case SkBitmap::kARGB_8888_Config: if (scale == 256) { SkPMColor* src = fDevice->getAddr32(x, y); @@ -103,7 +103,7 @@ void SkTransparentShader::shadeSpan(int x, int y, SkPMColor span[], int count) { } void SkTransparentShader::shadeSpan16(int x, int y, uint16_t span[], int count) { - SkASSERT(fDevice->getConfig() == SkBitmap::kRGB_565_Config); + SkASSERT(fDevice->config() == SkBitmap::kRGB_565_Config); uint16_t* src = fDevice->getAddr16(x, y); if (src != span) { |