Merge from Chromium at DEPS revision r213371
This commit was generated by merge_to_master.py.
Change-Id: I03fae1c1dae6e5de12e56e0a6c3780252291bfae
diff --git a/Source/bindings/python_bindings_sources.target.linux-x86.mk b/Source/bindings/python_bindings_sources.target.linux-x86.mk
index 887dc59..55edf61 100644
--- a/Source/bindings/python_bindings_sources.target.linux-x86.mk
+++ b/Source/bindings/python_bindings_sources.target.linux-x86.mk
@@ -17,7 +17,7 @@
### Generated for rule "third_party_WebKit_Source_bindings_derived_sources_gyp_python_bindings_sources_target_python_binding":
-# "{'inputs': ['scripts/idl_compiler.py', '../../../ply/lex.py', '../../../ply/yacc.py', '../../../../tools/idl_parser/idl_lexer.py', '../../../../tools/idl_parser/idl_node.py', '../../../../tools/idl_parser/idl_parser.py', 'scripts/blink_idl_lexer.py', 'scripts/blink_idl_parser.py', 'scripts/code_generator_v8.py', 'scripts/idl_definitions.py', 'scripts/idl_definitions_builder.py', 'scripts/idl_reader.py', 'scripts/idl_validator.py', 'scripts/interface_dependency_resolver.py', 'scripts/IDLAttributes.txt', '$(gyp_shared_intermediate_dir)/InterfaceDependencies.txt', '../modules/filesystem/HTMLInputElementFileSystem.idl', '../core/dom/DocumentFullscreen.idl', '../modules/geolocation/NavigatorGeolocation.idl', '../modules/mediasource/WindowMediaSource.idl', '../modules/filesystem/WindowFileSystem.idl', '../modules/indexeddb/WindowIndexedDatabase.idl', '../modules/navigatorcontentutils/NavigatorContentUtils.idl', '../modules/mediastream/URLMediaStream.idl', '../modules/quota/WindowQuota.idl', '../modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl', '../modules/webmidi/NavigatorWebMIDI.idl', '../modules/notifications/WorkerGlobalScopeNotifications.idl', '../modules/webdatabase/WindowWebDatabase.idl', '../core/page/WindowPagePopup.idl', '../modules/webdatabase/WorkerGlobalScopeWebDatabase.idl', '../modules/mediastream/NavigatorMediaStream.idl', '../modules/mediasource/URLMediaSource.idl', '../modules/crypto/WorkerGlobalScopeCrypto.idl', '../modules/filesystem/DataTransferItemFileSystem.idl', '../modules/gamepad/NavigatorGamepad.idl', '../core/xml/DocumentXPathEvaluator.idl', '../modules/filesystem/WorkerGlobalScopeFileSystem.idl', '../modules/donottrack/NavigatorDoNotTrack.idl', '../modules/notifications/WindowNotifications.idl', '$(gyp_shared_intermediate_dir)/WindowConstructors.idl', '$(gyp_shared_intermediate_dir)/WorkerGlobalScopeConstructors.idl', '$(gyp_shared_intermediate_dir)/SharedWorkerGlobalScopeConstructors.idl', '$(gyp_shared_intermediate_dir)/DedicatedWorkerGlobalScopeConstructors.idl'], 'msvs_cygwin_shell': '0', 'extension': 'idl', 'msvs_external_rule': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/webkit/bindings/V8%(INPUT_ROOT)s.cpp', '$(gyp_shared_intermediate_dir)/webkit/bindings/V8%(INPUT_ROOT)s.h'], 'variables': {'extra_blink_generator_include_dirs%': [], 'generator_include_dirs': ['--include', '../core', '--include', '../modules', '--include', '$(gyp_shared_intermediate_dir)/webkit']}, 'rule_name': 'python_binding', 'rule_sources': ['../core/dom/ChildNode.idl', '../core/dom/DocumentFullscreen.idl', '../core/dom/ParentNode.idl', '../core/page/WindowPagePopup.idl', '../core/workers/AbstractWorker.idl', '../modules/crypto/WindowCrypto.idl', '../modules/crypto/WorkerGlobalScopeCrypto.idl', '../modules/donottrack/NavigatorDoNotTrack.idl', '../modules/filesystem/DataTransferItemFileSystem.idl', '../modules/filesystem/HTMLInputElementFileSystem.idl', '../modules/filesystem/WindowFileSystem.idl', '../modules/filesystem/WorkerGlobalScopeFileSystem.idl', '../modules/gamepad/NavigatorGamepad.idl', '../modules/geolocation/NavigatorGeolocation.idl', '../modules/indexeddb/WindowIndexedDatabase.idl', '../modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl', '../modules/mediasource/WindowMediaSource.idl', '../modules/mediastream/NavigatorMediaStream.idl', '../modules/navigatorcontentutils/NavigatorContentUtils.idl', '../modules/notifications/WindowNotifications.idl', '../modules/notifications/WorkerGlobalScopeNotifications.idl', '../modules/performance/WorkerGlobalScopePerformance.idl', '../modules/quota/NavigatorStorageQuota.idl', '../modules/quota/WindowQuota.idl', '../modules/quota/WorkerNavigatorStorageQuota.idl', '../modules/speech/WindowSpeechSynthesis.idl', '../modules/vibration/NavigatorVibration.idl', '../modules/webdatabase/WindowWebDatabase.idl', '../modules/webdatabase/WorkerGlobalScopeWebDatabase.idl', '../modules/webmidi/NavigatorWebMIDI.idl', '../core/svg/SVGExternalResourcesRequired.idl', '../core/svg/SVGFilterPrimitiveStandardAttributes.idl', '../core/svg/SVGFitToViewBox.idl', '../core/svg/SVGTests.idl', '../core/svg/SVGURIReference.idl', '../core/svg/SVGZoomAndPan.idl'], 'action': ['python', 'scripts/idl_compiler.py', '--output-dir', '$(gyp_shared_intermediate_dir)/webkit/bindings', '--idl-attributes-file', 'scripts/IDLAttributes.txt', '--include', '../core', '--include', '../modules', '--include', '$(gyp_shared_intermediate_dir)/webkit', '--interface-dependencies-file', '$(gyp_shared_intermediate_dir)/InterfaceDependencies.txt', '--additional-idl-files', '../core/testing/Internals.idl ../core/testing/InternalProfilers.idl ../core/testing/InternalSettings.idl ../core/testing/LayerRect.idl ../core/testing/LayerRectList.idl ../core/testing/MallocStatistics.idl ../core/testing/TypeConversions.idl "$(gyp_shared_intermediate_dir)/webkit/InternalSettingsGenerated.idl" "$(gyp_shared_intermediate_dir)/webkit/InternalRuntimeFlags.idl"', '--write-file-only-if-changed', '0', '$(RULE_SOURCES)'], 'message': 'Generating binding from $(RULE_SOURCES)'}":
+# "{'inputs': ['scripts/idl_compiler.py', '../../../../third_party/ply/lex.py', '../../../../third_party/ply/yacc.py', '../../../../tools/idl_parser/idl_lexer.py', '../../../../tools/idl_parser/idl_node.py', '../../../../tools/idl_parser/idl_parser.py', 'scripts/blink_idl_lexer.py', 'scripts/blink_idl_parser.py', 'scripts/code_generator_v8.py', 'scripts/idl_definitions.py', 'scripts/idl_definitions_builder.py', 'scripts/idl_reader.py', 'scripts/idl_validator.py', 'scripts/interface_dependency_resolver.py', 'scripts/IDLAttributes.txt', '$(gyp_shared_intermediate_dir)/InterfaceDependencies.txt', '../modules/filesystem/HTMLInputElementFileSystem.idl', '../core/dom/DocumentFullscreen.idl', '../modules/geolocation/NavigatorGeolocation.idl', '../modules/mediasource/WindowMediaSource.idl', '../modules/filesystem/WindowFileSystem.idl', '../modules/indexeddb/WindowIndexedDatabase.idl', '../modules/navigatorcontentutils/NavigatorContentUtils.idl', '../modules/mediastream/URLMediaStream.idl', '../modules/quota/WindowQuota.idl', '../modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl', '../modules/webmidi/NavigatorWebMIDI.idl', '../modules/notifications/WorkerGlobalScopeNotifications.idl', '../modules/webdatabase/WindowWebDatabase.idl', '../core/page/WindowPagePopup.idl', '../modules/webdatabase/WorkerGlobalScopeWebDatabase.idl', '../modules/mediastream/NavigatorMediaStream.idl', '../modules/mediasource/URLMediaSource.idl', '../modules/crypto/WorkerGlobalScopeCrypto.idl', '../modules/filesystem/DataTransferItemFileSystem.idl', '../modules/gamepad/NavigatorGamepad.idl', '../core/xml/DocumentXPathEvaluator.idl', '../modules/filesystem/WorkerGlobalScopeFileSystem.idl', '../modules/donottrack/NavigatorDoNotTrack.idl', '../modules/notifications/WindowNotifications.idl', '$(gyp_shared_intermediate_dir)/WindowConstructors.idl', '$(gyp_shared_intermediate_dir)/WorkerGlobalScopeConstructors.idl', '$(gyp_shared_intermediate_dir)/SharedWorkerGlobalScopeConstructors.idl', '$(gyp_shared_intermediate_dir)/DedicatedWorkerGlobalScopeConstructors.idl'], 'msvs_cygwin_shell': '0', 'extension': 'idl', 'msvs_external_rule': '1', 'outputs': ['$(gyp_shared_intermediate_dir)/webkit/bindings/V8%(INPUT_ROOT)s.cpp', '$(gyp_shared_intermediate_dir)/webkit/bindings/V8%(INPUT_ROOT)s.h'], 'variables': {'extra_blink_generator_include_dirs%': [], 'generator_include_dirs': ['--include', '../core', '--include', '../modules', '--include', '$(gyp_shared_intermediate_dir)/webkit']}, 'rule_name': 'python_binding', 'rule_sources': ['../core/dom/ChildNode.idl', '../core/dom/DocumentFullscreen.idl', '../core/dom/ParentNode.idl', '../core/page/WindowPagePopup.idl', '../core/workers/AbstractWorker.idl', '../modules/crypto/WindowCrypto.idl', '../modules/crypto/WorkerGlobalScopeCrypto.idl', '../modules/donottrack/NavigatorDoNotTrack.idl', '../modules/filesystem/DataTransferItemFileSystem.idl', '../modules/filesystem/HTMLInputElementFileSystem.idl', '../modules/filesystem/WindowFileSystem.idl', '../modules/filesystem/WorkerGlobalScopeFileSystem.idl', '../modules/gamepad/NavigatorGamepad.idl', '../modules/geolocation/NavigatorGeolocation.idl', '../modules/indexeddb/WindowIndexedDatabase.idl', '../modules/indexeddb/WorkerGlobalScopeIndexedDatabase.idl', '../modules/mediasource/WindowMediaSource.idl', '../modules/mediastream/NavigatorMediaStream.idl', '../modules/navigatorcontentutils/NavigatorContentUtils.idl', '../modules/notifications/WindowNotifications.idl', '../modules/notifications/WorkerGlobalScopeNotifications.idl', '../modules/performance/WorkerGlobalScopePerformance.idl', '../modules/quota/NavigatorStorageQuota.idl', '../modules/quota/WindowQuota.idl', '../modules/quota/WorkerNavigatorStorageQuota.idl', '../modules/speech/WindowSpeechSynthesis.idl', '../modules/vibration/NavigatorVibration.idl', '../modules/webdatabase/WindowWebDatabase.idl', '../modules/webdatabase/WorkerGlobalScopeWebDatabase.idl', '../modules/webmidi/NavigatorWebMIDI.idl', '../core/svg/SVGExternalResourcesRequired.idl', '../core/svg/SVGFilterPrimitiveStandardAttributes.idl', '../core/svg/SVGFitToViewBox.idl', '../core/svg/SVGTests.idl', '../core/svg/SVGURIReference.idl', '../core/svg/SVGZoomAndPan.idl'], 'action': ['python', 'scripts/idl_compiler.py', '--output-dir', '$(gyp_shared_intermediate_dir)/webkit/bindings', '--idl-attributes-file', 'scripts/IDLAttributes.txt', '--include', '../core', '--include', '../modules', '--include', '$(gyp_shared_intermediate_dir)/webkit', '--interface-dependencies-file', '$(gyp_shared_intermediate_dir)/InterfaceDependencies.txt', '--additional-idl-files', '../core/testing/Internals.idl ../core/testing/InternalProfilers.idl ../core/testing/InternalSettings.idl ../core/testing/LayerRect.idl ../core/testing/LayerRectList.idl ../core/testing/MallocStatistics.idl ../core/testing/TypeConversions.idl "$(gyp_shared_intermediate_dir)/webkit/InternalSettingsGenerated.idl" "$(gyp_shared_intermediate_dir)/webkit/InternalRuntimeFlags.idl"', '--write-file-only-if-changed', '0', '$(RULE_SOURCES)'], 'message': 'Generating binding from $(RULE_SOURCES)'}":
$(gyp_shared_intermediate_dir)/webkit/bindings/V8ChildNode.cpp: gyp_local_path := $(LOCAL_PATH)
$(gyp_shared_intermediate_dir)/webkit/bindings/V8ChildNode.cpp: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/webkit/bindings/V8ChildNode.cpp: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
@@ -549,10 +549,10 @@
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
- '-DENABLE_LANGUAGE_DETECTION=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -632,10 +632,10 @@
'-DCHROMIUM_BUILD' \
'-DUSE_LIBJPEG_TURBO=1' \
'-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
'-DENABLE_GPU=1' \
'-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
- '-DENABLE_LANGUAGE_DETECTION=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \