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

Side by Side Diff: gyp/common_conditions.gypi

Issue 368953005: Remove SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: oops Created 6 years, 5 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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 # using freetype's embolden allows us to adjust fake bold settings at 357 # using freetype's embolden allows us to adjust fake bold settings at
358 # draw-time, at which point we know which SkTypeface is being drawn 358 # draw-time, at which point we know which SkTypeface is being drawn
359 'SK_USE_FREETYPE_EMBOLDEN', 359 'SK_USE_FREETYPE_EMBOLDEN',
360 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"', 360 'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
361 # When built as part of the system image we can enable certian non-NDK 361 # When built as part of the system image we can enable certian non-NDK
362 # compliant optimizations. 362 # compliant optimizations.
363 'SK_BUILD_FOR_ANDROID_FRAMEWORK', 363 'SK_BUILD_FOR_ANDROID_FRAMEWORK',
364 # Optimizations for chromium (m30) 364 # Optimizations for chromium (m30)
365 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"', 365 'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
366 'IGNORE_ROT_AA_RECT_OPT', 366 'IGNORE_ROT_AA_RECT_OPT',
367 # Disable this check because it is too strict for some chromium-specific
368 # subclasses of SkPixelRef. See bug: crbug.com/171776.
369 'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
370 'SkLONGLONG int64_t', 367 'SkLONGLONG int64_t',
371 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)', 368 'SK_DEFAULT_FONT_CACHE_LIMIT (768 * 1024)',
372 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"', 369 'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_sync.h"',
373 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"', 370 'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
374 # Still need to switch Android to the new name for N32. 371 # Still need to switch Android to the new name for N32.
375 'kNative_8888_SkColorType kN32_SkColorType', 372 'kNative_8888_SkColorType kN32_SkColorType',
376 # Needed until we fix skbug.com/2440. 373 # Needed until we fix skbug.com/2440.
377 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG', 374 'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
378 # Transitional, for deprecated SkCanvas::SaveFlags methods. 375 # Transitional, for deprecated SkCanvas::SaveFlags methods.
379 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1', 376 'SK_ATTR_DEPRECATED=SK_NOTHING_ARG1',
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d 693 # add flags here (e.g. SK_SUPPORT_LEGACY_...) needed by moz2d
697 ], 694 ],
698 }], 695 }],
699 696
700 ], # end 'conditions' 697 ], # end 'conditions'
701 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 698 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
702 'xcode_settings': { 699 'xcode_settings': {
703 'SYMROOT': '<(DEPTH)/xcodebuild', 700 'SYMROOT': '<(DEPTH)/xcodebuild',
704 }, 701 },
705 } 702 }
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