diff options
author | robertphillips <robertphillips@google.com> | 2015-08-04 08:04:29 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 08:04:29 -0700 |
commit | fae010266f32b715f334c8680aeada2c72d44668 (patch) | |
tree | 5833b30193855c70ae3d5b2643f7eb95f641e60b | |
parent | 4b3050b410254d0cb38df9a30ae2e209124fa1a2 (diff) |
Remove IGNORE_ROT_AA_RECT_OPT flag
It looks like the positive version was added (SHADER_AA_FILL_RECT) but the negative version wasn't removed.
Review URL: https://codereview.chromium.org/1271903003
-rw-r--r-- | gyp/common_conditions.gypi | 1 | ||||
-rw-r--r-- | src/gpu/GrDrawContext.cpp | 4 | ||||
-rw-r--r-- | src/gpu/SkGpuDevice.cpp | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 0138bcf90a..cce9f151b8 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -385,7 +385,6 @@ 'SK_BUILD_FOR_ANDROID_FRAMEWORK', # Optimizations for chromium (m30) 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', - 'IGNORE_ROT_AA_RECT_OPT', 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 'SK_IGNORE_ETC1_SUPPORT', diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp index 1a7734d0f8..288841c112 100644 --- a/src/gpu/GrDrawContext.cpp +++ b/src/gpu/GrDrawContext.cpp @@ -217,14 +217,14 @@ static bool apply_aa_to_rect(GrDrawTarget* target, return false; } -#if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT) +#ifdef SHADER_AA_FILL_RECT if (strokeWidth >= 0) { #endif if (!combinedMatrix.preservesAxisAlignment()) { return false; } -#if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT) +#ifdef SHADER_AA_FILL_RECT } else { if (!combinedMatrix.preservesRightAngles()) { return false; diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 4a835bb18d..6358181d40 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -495,11 +495,11 @@ void SkGpuDevice::drawRect(const SkDraw& draw, const SkRect& rect, } if (!usePath && paint.isAntiAlias() && !draw.fMatrix->rectStaysRect()) { -#if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT) +#ifdef SHADER_AA_FILL_RECT if (doStroke) { #endif usePath = true; -#if defined(SHADER_AA_FILL_RECT) || !defined(IGNORE_ROT_AA_RECT_OPT) +#ifdef SHADER_AA_FILL_RECT } else { usePath = !draw.fMatrix->preservesRightAngles(); } |