Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1049)

Side by Side Diff: gyp/common_conditions.gypi

Issue 332163005: remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE -- not needed (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 'SK_SUPPORT_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 'IGNORE_ROT_AA_RECT_OPT', 332 'IGNORE_ROT_AA_RECT_OPT',
333 # Disable this check because it is too strict for some chromium-specific 333 # Disable this check because it is too strict for some chromium-specific
334 # subclasses of SkPixelRef. See bug: crbug.com/171776. 334 # subclasses of SkPixelRef. See bug: crbug.com/171776.
335 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK', 335 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
336 'SkLONGLONG int64_t', 336 'SkLONGLONG int64_t',
337 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 337 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
338 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"', 338 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"',
339 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', 339 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
340 # Still need to switch Android to the new name for N32. 340 # Still need to switch Android to the new name for N32.
341 'kNative_8888_SkColorType kN32_SkColorType', 341 'kNative_8888_SkColorType kN32_SkColorType',
342 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
343 # Needed until we fix skbug.com/2440. 342 # Needed until we fix skbug.com/2440.
344 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', 343 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
345 # Transitional, for deprecated SkCanvas::SaveFlags methods. 344 # Transitional, for deprecated SkCanvas::SaveFlags methods.
346 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 345 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
347 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX', 346 'SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX',
348 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)', 347 'SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE (512 * 1024)',
349 'SK_IGNORE_ETC1_SUPPORT', 348 'SK_IGNORE_ETC1_SUPPORT',
350 # Defines from skia_for_android_framework_defines.gypi 349 # Defines from skia_for_android_framework_defines.gypi
351 '<@(skia_for_android_framework_defines)', 350 '<@(skia_for_android_framework_defines)',
352 ], 351 ],
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 'SK_BUILD_JSON_WRITER', 683 'SK_BUILD_JSON_WRITER',
685 ] 684 ]
686 }], 685 }],
687 686
688 ], # end 'conditions' 687 ], # end 'conditions'
689 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 688 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
690 'xcode_settings': { 689 'xcode_settings': {
691 'SYMROOT': '<(DEPTH)/xcodebuild', 690 'SYMROOT': '<(DEPTH)/xcodebuild',
692 }, 691 },
693 } 692 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698