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

Unified Diff: skia/skia_library.gypi

Issue 24146010: Roll Skia DEPS to r11429 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/config/SkUserConfig.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/skia_library.gypi
===================================================================
--- skia/skia_library.gypi (revision 224630)
+++ skia/skia_library.gypi (working copy)
@@ -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
« no previous file with comments | « skia/config/SkUserConfig.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698