diff options
| author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 11:58:53 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 11:58:53 +0000 |
| commit | 77b94fa024b00bd1c43c22d44cc2f99eb487bf01 (patch) | |
| tree | 69d5275c018e53320faa03d6bd64f969d2eb8685 /skia/skia_library.gypi | |
| parent | d84b147883527f377e24113d6a82068b55574a84 (diff) | |
| download | chromium_src-77b94fa024b00bd1c43c22d44cc2f99eb487bf01.zip chromium_src-77b94fa024b00bd1c43c22d44cc2f99eb487bf01.tar.gz chromium_src-77b94fa024b00bd1c43c22d44cc2f99eb487bf01.tar.bz2 | |
Roll Skia DEPS to r11429
R=rmistry@google.com
Review URL: https://codereview.chromium.org/24146010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 9c8edc4..2ed1854 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -40,6 +40,7 @@ 'SK_ENABLE_INST_COUNT=0', 'SK_SUPPORT_GPU=<(skia_support_gpu)', 'GR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"', + 'SK_ENABLE_LEGACY_API_ALIASING=1', ], 'default_font_cache_limit': '(20*1024*1024)', @@ -316,7 +317,6 @@ [ 'OS == "ios"', { 'defines': [ 'SK_BUILD_FOR_IOS', - 'SK_USE_MAC_CORE_TEXT', ], 'include_dirs': [ '../third_party/skia/include/utils/ios', @@ -352,7 +352,6 @@ [ 'OS == "mac"', { 'defines': [ 'SK_BUILD_FOR_MAC', - 'SK_USE_MAC_CORE_TEXT', ], 'direct_dependent_settings': { 'include_dirs': [ @@ -425,9 +424,6 @@ 'defines': [ '<@(skia_export_defines)', - # this flag can be removed entirely once this has baked for a while - 'SK_ALLOW_OVER_32K_BITMAPS', - # skia uses static initializers to initialize the serialization logic # of its "pictures" library. This is currently not used in chrome; if # it ever gets used the processes that use it need to call |