Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: Ia8a6c2a997232c94108d8937f8c2556f42be1c37
diff --git a/Source/core/webcore_platform_geometry.target.darwin-x86.mk b/Source/core/webcore_platform_geometry.target.darwin-x86.mk
index 58c0ff0..de5ab8e 100644
--- a/Source/core/webcore_platform_geometry.target.darwin-x86.mk
+++ b/Source/core/webcore_platform_geometry.target.darwin-x86.mk
@@ -78,6 +78,7 @@
MY_CFLAGS_C :=
MY_DEFS := \
+ '-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
'-DNO_TCMALLOC' \
@@ -91,9 +92,9 @@
'-DENABLE_LANGUAGE_DETECTION=1' \
'-DWEBCORE_NAVIGATOR_VENDOR="Google Inc."' \
'-DWEBKIT_IMPLEMENTATION=1' \
- '-DENABLE_CANVAS_USES_MAILBOX=0' \
+ '-DINSIDE_WEBKIT' \
+ '-DENABLE_CANVAS_USES_MAILBOX=1' \
'-DENABLE_CSS3_TEXT=0' \
- '-DENABLE_CSS_DEVICE_ADAPTATION=0' \
'-DENABLE_CSS_EXCLUSIONS=1' \
'-DENABLE_CSS_REGIONS=1' \
'-DENABLE_CUSTOM_SCHEME_HANDLER=0' \
@@ -102,6 +103,7 @@
'-DENABLE_SVG_FONTS=1' \
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_XHR_TIMEOUT=0' \
+ '-DENABLE_GDI_FONTS_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
'-DENABLE_CALENDAR_PICKER=0' \
'-DENABLE_FAST_MOBILE_SCROLLING=1' \
@@ -116,6 +118,7 @@
'-DENABLE_8BIT_TEXTRUN=1' \
'-DENABLE_OPENTYPE_VERTICAL=1' \
'-DWTF_USE_HARFBUZZ=1' \
+ '-DENABLE_PARTITION_ALLOC=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DSK_BUILD_NO_IMAGE_ENCODE' \
'-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \
@@ -152,7 +155,7 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/webkit \
$(gyp_shared_intermediate_dir)/webkit/bindings \
- $(LOCAL_PATH)/third_party/angle/include/GLSLANG \
+ $(LOCAL_PATH)/third_party/angle_dx11/include/GLSLANG \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/skia/config \
@@ -169,8 +172,8 @@
$(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/iccjpeg \
- $(LOCAL_PATH)/third_party/libwebp \
$(LOCAL_PATH)/third_party/libpng \
+ $(LOCAL_PATH)/third_party/libwebp \
$(LOCAL_PATH)/third_party/libxml/linux/include \
$(LOCAL_PATH)/third_party/libxml/src/include \
$(LOCAL_PATH)/third_party/libxslt \