Merge from Chromium at DEPS revision 275586
This commit was generated by merge_to_master.py.
Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
diff --git a/skia/skia_chrome.target.darwin-x86_64.mk b/skia/skia_chrome.target.darwin-x86_64.mk
index 3ff7925..19f4c38 100644
--- a/skia/skia_chrome.target.darwin-x86_64.mk
+++ b/skia/skia_chrome.target.darwin-x86_64.mk
@@ -98,7 +98,6 @@
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
- '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
@@ -118,11 +117,11 @@
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
- '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \
+ '-DSK_SUPPORT_LEGACY_SETCONFIG_INFO' \
'-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \
+ '-DSK_IGNORE_ETC1_SUPPORT' \
'-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \
- '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \
+ '-DSK_SUPPORT_LEGACY_DRAWPICTURE_API' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
@@ -134,7 +133,6 @@
'-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
'-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
'-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \
- '-DSK_IGNORE_DWRITE_BITMAP_FIX' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
'-DSK_GAMMA_APPLY_TO_A8' \
'-DSK_GAMMA_EXPONENT=1.4' \
@@ -234,7 +232,6 @@
'-DENABLE_WEBRTC=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
- '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
@@ -254,11 +251,11 @@
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
- '-DSK_SUPPORT_LEGACY_ASIMAGEINFO' \
+ '-DSK_SUPPORT_LEGACY_SETCONFIG_INFO' \
'-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE' \
+ '-DSK_IGNORE_ETC1_SUPPORT' \
'-DSK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS' \
- '-DSK_SUPPORT_LEGACY_IMAGEGENERATORAPI' \
+ '-DSK_SUPPORT_LEGACY_DRAWPICTURE_API' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
@@ -270,7 +267,6 @@
'-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
'-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
'-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \
- '-DSK_IGNORE_DWRITE_BITMAP_FIX' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
'-DSK_GAMMA_APPLY_TO_A8' \
'-DSK_GAMMA_EXPONENT=1.4' \