diff options
| -rw-r--r-- | gyp/common_conditions.gypi | 4 | ||||
| -rw-r--r-- | tests/CanvasStateTest.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index cc3aae4f91..0e4fca2e54 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -368,8 +368,6 @@ 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"', 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', - # Needed until we fix skbug.com/2440. - 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', # Transitional, for deprecated SkCanvas::SaveFlags methods. 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', @@ -669,6 +667,8 @@ 'defines': [ 'SKIA_DLL', 'SKIA_IMPLEMENTATION=1', + # Needed until we fix skbug.com/2440. + 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', ], }], [ 'skia_profile_enabled == 1', { diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp index 98a0b0ed92..eb84c11c7d 100644 --- a/tests/CanvasStateTest.cpp +++ b/tests/CanvasStateTest.cpp @@ -27,7 +27,6 @@ static void test_complex_layers(skiatest::Reporter* reporter) { const SkColorType colorTypes[] = { kRGB_565_SkColorType, kN32_SkColorType }; - const int configCount = sizeof(colorTypes) / sizeof(SkBitmap::Config); const int layerAlpha[] = { 255, 255, 0 }; const SkCanvas::SaveFlags flags[] = { SkCanvas::kARGB_NoClipLayer_SaveFlag, @@ -37,7 +36,7 @@ static void test_complex_layers(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, sizeof(layerAlpha) == sizeof(flags)); const int layerCombinations = sizeof(layerAlpha) / sizeof(int); - for (int i = 0; i < configCount; ++i) { + for (size_t i = 0; i < SK_ARRAY_COUNT(colorTypes); ++i) { SkBitmap bitmaps[2]; for (int j = 0; j < 2; ++j) { bitmaps[j].allocPixels(SkImageInfo::Make(WIDTH, HEIGHT, |