Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I834f3ca85c1ef7ec2c1061847a3d92aa461da043
diff --git a/Source/web/blink_web.target.linux-mips.mk b/Source/web/blink_web.target.linux-mips.mk
index bf86458..801eb1b 100644
--- a/Source/web/blink_web.target.linux-mips.mk
+++ b/Source/web/blink_web.target.linux-mips.mk
@@ -83,7 +83,6 @@
$(gyp_shared_intermediate_dir)/blink
LOCAL_SRC_FILES := \
- third_party/WebKit/Source/web/ApplicationCacheHost.cpp \
third_party/WebKit/Source/web/AssertMatchingEnums.cpp \
third_party/WebKit/Source/web/AssociatedURLLoader.cpp \
third_party/WebKit/Source/web/BackForwardClientImpl.cpp \
@@ -117,7 +116,6 @@
third_party/WebKit/Source/web/PageOverlayList.cpp \
third_party/WebKit/Source/web/PageScaleConstraintsSet.cpp \
third_party/WebKit/Source/web/PageWidgetDelegate.cpp \
- third_party/WebKit/Source/web/PinchViewports.cpp \
third_party/WebKit/Source/web/PopupContainer.cpp \
third_party/WebKit/Source/web/PopupListBox.cpp \
third_party/WebKit/Source/web/PopupMenuChromium.cpp \
@@ -143,7 +141,6 @@
third_party/WebKit/Source/web/WebCachedURLRequest.cpp \
third_party/WebKit/Source/web/WebColorName.cpp \
third_party/WebKit/Source/web/WebColorSuggestion.cpp \
- third_party/WebKit/Source/web/WebCrossOriginPreflightResultCache.cpp \
third_party/WebKit/Source/web/WebCustomElement.cpp \
third_party/WebKit/Source/web/WebDOMActivityLogger.cpp \
third_party/WebKit/Source/web/WebDOMCustomEvent.cpp \
@@ -170,7 +167,6 @@
third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp \
third_party/WebKit/Source/web/WebEntities.cpp \
third_party/WebKit/Source/web/WebFileChooserCompletionImpl.cpp \
- third_party/WebKit/Source/web/WebFontCache.cpp \
third_party/WebKit/Source/web/WebFontDescription.cpp \
third_party/WebKit/Source/web/WebFontImpl.cpp \
third_party/WebKit/Source/web/WebFormControlElement.cpp \
@@ -299,6 +295,7 @@
MY_DEFS_Debug := \
'-DV8_DEPRECATION_WARNINGS' \
+ '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -306,9 +303,9 @@
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
@@ -317,12 +314,9 @@
'-DINSIDE_BLINK' \
'-DENABLE_CUSTOM_SCHEME_HANDLER=0' \
'-DENABLE_SVG_FONTS=1' \
- '-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
- '-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
'-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
- '-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
'-DENABLE_OPENTYPE_VERTICAL=1' \
'-DU_USING_ICU_NAMESPACE=0' \
@@ -332,11 +326,17 @@
'-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \
+ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
+ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \
+ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
+ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DUSE_OPENSSL=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -438,6 +438,7 @@
MY_DEFS_Release := \
'-DV8_DEPRECATION_WARNINGS' \
+ '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
'-D_FILE_OFFSET_BITS=64' \
'-DNO_TCMALLOC' \
'-DDISABLE_NACL' \
@@ -445,9 +446,9 @@
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
'-DENABLE_CONFIGURATION_POLICY' \
+ '-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
@@ -456,12 +457,9 @@
'-DINSIDE_BLINK' \
'-DENABLE_CUSTOM_SCHEME_HANDLER=0' \
'-DENABLE_SVG_FONTS=1' \
- '-DENABLE_GDI_FONTS_ON_WINDOWS=0' \
- '-DENABLE_HARFBUZZ_ON_WINDOWS=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
'-DENABLE_FAST_MOBILE_SCROLLING=1' \
'-DENABLE_INPUT_SPEECH=0' \
- '-DENABLE_LEGACY_NOTIFICATIONS=0' \
'-DENABLE_MEDIA_CAPTURE=1' \
'-DENABLE_OPENTYPE_VERTICAL=1' \
'-DU_USING_ICU_NAMESPACE=0' \
@@ -471,11 +469,17 @@
'-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \
+ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
'-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \
'-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \
+ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \
+ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
+ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_USE_POSIX_THREADS' \
'-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DUSE_OPENSSL=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -545,9 +549,11 @@
LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
+LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
LOCAL_LDFLAGS_Debug := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -557,7 +563,6 @@
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -565,6 +570,7 @@
LOCAL_LDFLAGS_Release := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -577,7 +583,6 @@
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel