Index: third_party/WebKit/Source/core/BUILD.gn |
diff --git a/third_party/WebKit/Source/core/BUILD.gn b/third_party/WebKit/Source/core/BUILD.gn |
index 6d30dc7a0499f3df5d804ee789bad04536faecbb..4a6d874eb48c60753a366aae8aea18ab5ac83399 100644 |
--- a/third_party/WebKit/Source/core/BUILD.gn |
+++ b/third_party/WebKit/Source/core/BUILD.gn |
@@ -62,6 +62,7 @@ source_set("generated") { |
"//third_party/qcms", |
"//third_party/sqlite", |
"//third_party/WebKit/Source/bindings/core/v8:bindings_core_v8_generated", |
+ |
# FIXME: don't depend on bindings/modules http://crbug.com/358074 |
"//third_party/WebKit/Source/bindings/modules:bindings_modules_generated", |
"//third_party/WebKit/Source/bindings/modules/v8:bindings_modules_generated", |
@@ -99,6 +100,7 @@ source_set("prerequisites") { |
"inspector:protocol_sources", |
"inspector:instrumentation_sources", |
"//third_party/WebKit/Source/bindings/core/v8:bindings_core_v8_generated", |
+ |
# FIXME: don't depend on bindings_modules http://crbug.com/358074 |
"//third_party/WebKit/Source/bindings/modules/v8:bindings_modules_generated", |
"//third_party/WebKit/Source/platform", |
@@ -110,10 +112,12 @@ source_set("prerequisites") { |
"//third_party/WebKit/Source:inside_blink", |
] |
+ if (is_mac) { |
+ public_configs += [ "//third_party/WebKit/Source:mac_precompiled_headers" ] |
+ } |
+ |
if (use_openmax_dl_fft) { |
- deps += [ |
- "//third_party/openmax_dl/dl" |
- ] |
+ deps += [ "//third_party/openmax_dl/dl" ] |
} |
} |
@@ -148,9 +152,7 @@ source_set("core") { |
":svg", |
] |
- public_configs = [ |
- ":core_include_dirs", |
- ] |
+ public_configs = [ ":core_include_dirs" ] |
# TODO(GYP) IPP libraries pkg-config. These seem to be experimental and used |
# only on x86 Android. See also below. There should be one pkg-config call |
@@ -163,9 +165,9 @@ source_set("dom") { |
configs -= core_config_remove |
configs += core_config_add + [ |
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
- "//build/config/compiler:no_size_t_to_int_warning", |
- ] |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ "//build/config/compiler:no_size_t_to_int_warning", |
+ ] |
deps = [ |
":prerequisites", |
@@ -203,7 +205,7 @@ source_set("svg") { |
] |
# TODO(GYP) |
- # Shard this taret into parts to work around linker limitations. |
+ # Shard this target into parts to work around linker limitations. |
# on link time code generation builds. |
#['OS=="win" and buildtype=="Official"', { |
# 'msvs_shard': 5, |
@@ -221,9 +223,9 @@ source_set("remaining") { |
configs -= core_config_remove |
configs += core_config_add + [ |
- # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
- "//build/config/compiler:no_size_t_to_int_warning", |
- ] |
+ # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
+ "//build/config/compiler:no_size_t_to_int_warning", |
+ ] |
cflags = [] |
libs = [] |
@@ -233,9 +235,7 @@ source_set("remaining") { |
] |
if (is_win) { |
- cflags += [ |
- "/wd4334", |
- ] |
+ cflags += [ "/wd4334" ] |
} else { # !is_win |
sources -= [ |
"layout/LayoutThemeFontProviderWin.cpp", |
@@ -249,9 +249,7 @@ source_set("remaining") { |
"layout/LayoutThemeLinux.h", |
] |
if (!is_android) { |
- sources -= [ |
- "layout/LayoutThemeFontProviderLinux.cpp", |
- ] |
+ sources -= [ "layout/LayoutThemeFontProviderLinux.cpp" ] |
} |
} |
@@ -277,16 +275,8 @@ source_set("remaining") { |
"paint/ThemePainterDefault.h", |
] |
libs += [ "Carbon.framework" ] |
- # Some Mac-specific parts of WebKit won't compile without having this |
- # prefix header injected. |
- cflags = [ |
- "-include", |
- rebase_path("../build/mac/Prefix.h", root_build_dir), |
- ] |
} else { # !is_mac |
- sources -= [ |
- "editing/commands/SmartReplaceCF.cpp", |
- ] |
+ sources -= [ "editing/commands/SmartReplaceCF.cpp" ] |
} |
} |
@@ -313,44 +303,46 @@ source_set("testing") { |
sources += [ |
"$bindings_core_v8_output_dir/V8DictionaryTest.cpp", |
"$bindings_core_v8_output_dir/V8DictionaryTest.h", |
- "$bindings_core_v8_output_dir/V8GarbageCollectedScriptWrappable.cpp", |
- "$bindings_core_v8_output_dir/V8GarbageCollectedScriptWrappable.h", |
"$bindings_core_v8_output_dir/V8GCObservation.cpp", |
"$bindings_core_v8_output_dir/V8GCObservation.h", |
- "$bindings_core_v8_output_dir/V8PrivateScriptTest.cpp", |
- "$bindings_core_v8_output_dir/V8PrivateScriptTest.h", |
- "$bindings_core_v8_output_dir/V8TypeConversions.cpp", |
- "$bindings_core_v8_output_dir/V8TypeConversions.h", |
- "$bindings_core_v8_output_dir/V8UnionTypesTest.cpp", |
- "$bindings_core_v8_output_dir/V8UnionTypesTest.h", |
- "$bindings_core_v8_output_dir/V8Internals.cpp", |
- "$bindings_core_v8_output_dir/V8Internals.h", |
+ "$bindings_core_v8_output_dir/V8GarbageCollectedScriptWrappable.cpp", |
+ "$bindings_core_v8_output_dir/V8GarbageCollectedScriptWrappable.h", |
+ "$bindings_core_v8_output_dir/V8InternalDictionary.cpp", |
+ "$bindings_core_v8_output_dir/V8InternalDictionary.h", |
+ "$bindings_core_v8_output_dir/V8InternalDictionaryDerived.cpp", |
+ "$bindings_core_v8_output_dir/V8InternalDictionaryDerived.h", |
+ "$bindings_core_v8_output_dir/V8InternalRuntimeFlags.cpp", |
+ "$bindings_core_v8_output_dir/V8InternalRuntimeFlags.h", |
"$bindings_core_v8_output_dir/V8InternalSettings.cpp", |
"$bindings_core_v8_output_dir/V8InternalSettings.h", |
"$bindings_core_v8_output_dir/V8InternalSettingsGenerated.cpp", |
"$bindings_core_v8_output_dir/V8InternalSettingsGenerated.h", |
- "$bindings_core_v8_output_dir/V8InternalRuntimeFlags.cpp", |
- "$bindings_core_v8_output_dir/V8InternalRuntimeFlags.h", |
+ "$bindings_core_v8_output_dir/V8Internals.cpp", |
+ "$bindings_core_v8_output_dir/V8Internals.h", |
"$bindings_core_v8_output_dir/V8LayerRect.cpp", |
"$bindings_core_v8_output_dir/V8LayerRect.h", |
"$bindings_core_v8_output_dir/V8LayerRectList.cpp", |
"$bindings_core_v8_output_dir/V8LayerRectList.h", |
+ "$bindings_core_v8_output_dir/V8PrivateScriptTest.cpp", |
+ "$bindings_core_v8_output_dir/V8PrivateScriptTest.h", |
"$bindings_core_v8_output_dir/V8RefCountedScriptWrappable.cpp", |
"$bindings_core_v8_output_dir/V8RefCountedScriptWrappable.h", |
- "$bindings_core_v8_output_dir/V8InternalDictionary.cpp", |
- "$bindings_core_v8_output_dir/V8InternalDictionary.h", |
- "$bindings_core_v8_output_dir/V8InternalDictionaryDerived.cpp", |
- "$bindings_core_v8_output_dir/V8InternalDictionaryDerived.h", |
+ "$bindings_core_v8_output_dir/V8TypeConversions.cpp", |
+ "$bindings_core_v8_output_dir/V8TypeConversions.h", |
+ "$bindings_core_v8_output_dir/V8UnionTypesTest.cpp", |
+ "$bindings_core_v8_output_dir/V8UnionTypesTest.h", |
] |
} |
# GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_generated |
source_set("core_generated") { |
sources = bindings_core_v8_files |
+ |
# These files include all the .cpp files generated from the .idl files |
# in webcore_files. |
sources += bindings_core_generated_aggregate_files |
sources += bindings_core_generated_union_type_files |
+ |
# IDL dictionary impl files generated by IDL compiler |
sources += generated_core_dictionary_files |
@@ -398,16 +390,16 @@ source_set("core_generated") { |
"$blink_core_output_dir/XPathGrammar.cpp", |
# Additional .cpp files from the inspector_protocol_sources list. |
- "$blink_core_output_dir/InspectorFrontend.cpp", |
"$blink_core_output_dir/InspectorBackendDispatcher.cpp", |
+ "$blink_core_output_dir/InspectorFrontend.cpp", |
"$blink_core_output_dir/InspectorTypeBuilder.cpp", |
# Additional .cpp files from the inspector_instrumentation_sources list. |
"$blink_core_output_dir/InspectorConsoleInstrumentationInl.h", |
+ "$blink_core_output_dir/InspectorInstrumentationImpl.cpp", |
"$blink_core_output_dir/InspectorInstrumentationInl.h", |
"$blink_core_output_dir/InspectorOverridesInl.h", |
"$blink_core_output_dir/InstrumentingAgentsInl.h", |
- "$blink_core_output_dir/InspectorInstrumentationImpl.cpp", |
# Additional .cpp files for SVG. |
"$blink_core_output_dir/SVGElementFactory.cpp", |
@@ -426,9 +418,7 @@ source_set("core_generated") { |
configs -= core_config_remove |
configs += core_config_add |
- configs += [ |
- "..:inside_blink", |
- ] |
+ configs += [ "..:inside_blink" ] |
public_deps = [ |
":make_core_generated", |
@@ -446,6 +436,7 @@ source_set("core_generated") { |
"//third_party/qcms", |
"//third_party/sqlite", |
"//third_party/WebKit/Source/bindings/core/v8:bindings_core_v8_generated", |
+ |
# FIXME: don't depend on bindings/modules http://crbug.com/358074 |
"//third_party/WebKit/Source/bindings/modules:bindings_modules_generated", |
"//third_party/WebKit/Source/bindings/modules/v8:bindings_modules_generated", |
@@ -457,12 +448,11 @@ source_set("core_generated") { |
configs += [ |
":core_include_dirs", |
+ |
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
"//build/config/compiler:no_size_t_to_int_warning", |
] |
- include_dirs = [ |
- "$root_gen_dir/blink", |
- ] |
+ include_dirs = [ "$root_gen_dir/blink" ] |
cflags = [] |
defines = [] |
@@ -516,17 +506,18 @@ action("generated_settings_macros") { |
script = "../build/scripts/make_settings.py" |
inputs = scripts_for_in_files + [ |
- "../build/scripts/make_settings.py", |
- "../build/scripts/templates/SettingsMacros.h.tmpl", |
- "frame/Settings.in", |
- ] |
+ "../build/scripts/make_settings.py", |
+ "../build/scripts/templates/SettingsMacros.h.tmpl", |
+ "frame/Settings.in", |
+ ] |
outputs = [ |
"$blink_core_output_dir/SettingsMacros.h", |
] |
args = [ |
rebase_path("frame/Settings.in", root_build_dir), |
- "--output_dir", rel_blink_core_gen_dir, |
+ "--output_dir", |
+ rel_blink_core_gen_dir, |
] |
} |
@@ -535,12 +526,12 @@ action("generated_testing_idls_settings") { |
script = "../build/scripts/make_internal_settings.py" |
inputs = scripts_for_in_files + [ |
- "../build/scripts/make_internal_settings.py", |
- "../build/scripts/templates/InternalSettingsGenerated.idl.tmpl", |
- "../build/scripts/templates/InternalSettingsGenerated.cpp.tmpl", |
- "../build/scripts/templates/InternalSettingsGenerated.h.tmpl", |
- "frame/Settings.in", |
- ] |
+ "../build/scripts/make_internal_settings.py", |
+ "../build/scripts/templates/InternalSettingsGenerated.idl.tmpl", |
+ "../build/scripts/templates/InternalSettingsGenerated.cpp.tmpl", |
+ "../build/scripts/templates/InternalSettingsGenerated.h.tmpl", |
+ "frame/Settings.in", |
+ ] |
outputs = [ |
"$blink_core_output_dir/testing/InternalSettingsGenerated.idl", |
"$blink_core_output_dir/testing/InternalSettingsGenerated.cpp", |
@@ -549,7 +540,8 @@ action("generated_testing_idls_settings") { |
args = [ |
rebase_path("frame/Settings.in", root_build_dir), |
- "--output_dir", "$rel_blink_core_gen_dir/testing", |
+ "--output_dir", |
+ "$rel_blink_core_gen_dir/testing", |
] |
} |
@@ -558,11 +550,11 @@ action("generated_testing_idls_internal_runtime_flags") { |
script = "../build/scripts/make_internal_runtime_flags.py" |
inputs = scripts_for_in_files + [ |
- "../build/scripts/make_internal_runtime_flags.py", |
- "../platform/RuntimeEnabledFeatures.in", |
- "../build/scripts/templates/InternalRuntimeFlags.h.tmpl", |
- "../build/scripts/templates/InternalRuntimeFlags.idl.tmpl", |
- ] |
+ "../build/scripts/make_internal_runtime_flags.py", |
+ "../platform/RuntimeEnabledFeatures.in", |
+ "../build/scripts/templates/InternalRuntimeFlags.h.tmpl", |
+ "../build/scripts/templates/InternalRuntimeFlags.idl.tmpl", |
+ ] |
outputs = [ |
"$blink_core_output_dir/testing/InternalRuntimeFlags.idl", |
"$blink_core_output_dir/testing/InternalRuntimeFlags.h", |
@@ -570,7 +562,8 @@ action("generated_testing_idls_internal_runtime_flags") { |
args = [ |
rebase_path("../platform/RuntimeEnabledFeatures.in", root_build_dir), |
- "--output_dir", "$rel_blink_core_gen_dir/testing", |
+ "--output_dir", |
+ "$rel_blink_core_gen_dir/testing", |
] |
} |
@@ -624,9 +617,7 @@ css_properties("make_core_generated_css_property_names") { |
# "MediaFeatures" in make_core_generated from GYP. |
process_in_files("make_core_generated_media_features") { |
script = "../build/scripts/make_media_features.py" |
- in_files = [ |
- "css/MediaFeatureNames.in", |
- ] |
+ in_files = [ "css/MediaFeatureNames.in" ] |
other_inputs = [ |
"../build/scripts/make_media_features.py", |
"../build/scripts/templates/MediaFeatures.h.tmpl", |
@@ -667,9 +658,7 @@ css_properties("make_core_generated_style_builder") { |
# "CSSPropertyMetadata" in make_core_generated from GYP. |
css_properties("make_core_generated_css_property_metadata") { |
script = "../build/scripts/make_css_property_metadata.py" |
- other_inputs = [ |
- "../build/scripts/templates/CSSPropertyMetadata.cpp.tmpl", |
- ] |
+ other_inputs = [ "../build/scripts/templates/CSSPropertyMetadata.cpp.tmpl" ] |
outputs = [ |
"$blink_core_output_dir/CSSPropertyMetadata.cpp", |
] |
@@ -688,7 +677,8 @@ process_in_files("make_core_generated_css_value_keywords") { |
"$blink_core_output_dir/CSSValueKeywords.h", |
] |
other_args = [ |
- "--gperf", gperf_exe, |
+ "--gperf", |
+ gperf_exe, |
] |
} |
@@ -713,9 +703,7 @@ process_in_files("make_core_generated_html_element_factory") { |
process_in_files("make_core_generated_html_element_type_helpers") { |
script = "../build/scripts/make_element_type_helpers.py" |
- in_files = [ |
- "html/HTMLTagNames.in", |
- ] |
+ in_files = [ "html/HTMLTagNames.in" ] |
other_inputs = make_element_type_helpers_files |
outputs = [ |
"$blink_core_output_dir/HTMLElementTypeHelpers.h", |
@@ -743,9 +731,7 @@ process_in_files("make_core_generated_svg_names") { |
process_in_files("make_core_generated_svg_element_type_helpers") { |
script = "../build/scripts/make_element_type_helpers.py" |
- in_files = [ |
- "svg/SVGTagNames.in", |
- ] |
+ in_files = [ "svg/SVGTagNames.in" ] |
other_inputs = make_element_type_helpers_files |
outputs = [ |
"$blink_core_output_dir/SVGElementTypeHelpers.h", |
@@ -774,9 +760,7 @@ process_in_files("make_core_generated_event_factory") { |
# "MediaFeatureNames" in make_core_generated from GYP. |
process_in_files("make_core_generated_media_feature_names") { |
script = "../build/scripts/make_media_feature_names.py" |
- in_files = [ |
- "css/MediaFeatureNames.in", |
- ] |
+ in_files = [ "css/MediaFeatureNames.in" ] |
other_inputs = make_names_files |
outputs = [ |
"$blink_core_output_dir/MediaFeatureNames.cpp", |
@@ -786,9 +770,7 @@ process_in_files("make_core_generated_media_feature_names") { |
# "MediaTypeNames" in make_core_generated from GYP. |
make_names("make_core_generated_media_type_names") { |
- in_files = [ |
- "css/MediaTypeNames.in", |
- ] |
+ in_files = [ "css/MediaTypeNames.in" ] |
outputs = [ |
"$blink_core_output_dir/MediaTypeNames.cpp", |
"$blink_core_output_dir/MediaTypeNames.h", |
@@ -797,9 +779,7 @@ make_names("make_core_generated_media_type_names") { |
# "EventNames" in make_core_generated from GYP. |
make_names("make_core_generated_event_names") { |
- in_files = [ |
- "$blink_core_output_dir/EventInterfaces.in", |
- ] |
+ in_files = [ "$blink_core_output_dir/EventInterfaces.in" ] |
outputs = [ |
"$blink_core_output_dir/EventNames.cpp", |
"$blink_core_output_dir/EventNames.h", |
@@ -808,9 +788,7 @@ make_names("make_core_generated_event_names") { |
# "EventTargetNames" in make_core_generated from GYP. |
make_names("make_core_generated_event_target_names") { |
- in_files = [ |
- "events/EventTargetFactory.in", |
- ] |
+ in_files = [ "events/EventTargetFactory.in" ] |
outputs = [ |
"$blink_core_output_dir/EventTargetNames.cpp", |
"$blink_core_output_dir/EventTargetNames.h", |
@@ -819,9 +797,7 @@ make_names("make_core_generated_event_target_names") { |
# "FetchInitiatorTypeNames" in make_core_generated from GYP. |
make_names("make_core_generated_fetch_initiator_type_names") { |
- in_files = [ |
- "fetch/FetchInitiatorTypeNames.in", |
- ] |
+ in_files = [ "fetch/FetchInitiatorTypeNames.in" ] |
outputs = [ |
"$blink_core_output_dir/fetch/FetchInitiatorTypeNames.cpp", |
"$blink_core_output_dir/fetch/FetchInitiatorTypeNames.h", |
@@ -830,9 +806,7 @@ make_names("make_core_generated_fetch_initiator_type_names") { |
# "EventTypeNames" in make_core_generated from GYP. |
make_names("make_core_generated_event_type_names") { |
- in_files = [ |
- "events/EventTypeNames.in", |
- ] |
+ in_files = [ "events/EventTypeNames.in" ] |
outputs = [ |
"$blink_core_output_dir/EventTypeNames.cpp", |
"$blink_core_output_dir/EventTypeNames.h", |
@@ -841,9 +815,7 @@ make_names("make_core_generated_event_type_names") { |
# "HTMLTokenizerNames" in make_core_generated from GYP. |
make_names("make_core_generated_html_tokenizer_names") { |
- in_files = [ |
- "html/parser/HTMLTokenizerNames.in", |
- ] |
+ in_files = [ "html/parser/HTMLTokenizerNames.in" ] |
outputs = [ |
"$blink_core_output_dir/HTMLTokenizerNames.cpp", |
"$blink_core_output_dir/HTMLTokenizerNames.h", |
@@ -852,9 +824,7 @@ make_names("make_core_generated_html_tokenizer_names") { |
# "InputTypeNames" in make_core_generated from GYP. |
make_names("make_core_generated_input_type_names") { |
- in_files = [ |
- "html/forms/InputTypeNames.in", |
- ] |
+ in_files = [ "html/forms/InputTypeNames.in" ] |
outputs = [ |
"$blink_core_output_dir/InputTypeNames.cpp", |
"$blink_core_output_dir/InputTypeNames.h", |
@@ -877,9 +847,7 @@ make_qualified_names("make_core_generated_math_ml_names") { |
# "XLinkNames" in make_core_generated from GYP. |
make_qualified_names("make_core_generated_xlink_names") { |
- in_files = [ |
- "svg/xlinkattrs.in", |
- ] |
+ in_files = [ "svg/xlinkattrs.in" ] |
outputs = [ |
"$blink_core_output_dir/XLinkNames.cpp", |
"$blink_core_output_dir/XLinkNames.h", |
@@ -888,9 +856,7 @@ make_qualified_names("make_core_generated_xlink_names") { |
# "XMLNSNames" in make_core_generated from GYP. |
make_qualified_names("make_core_generated_xml_ns_names") { |
- in_files = [ |
- "xml/xmlnsattrs.in", |
- ] |
+ in_files = [ "xml/xmlnsattrs.in" ] |
outputs = [ |
"$blink_core_output_dir/XMLNSNames.cpp", |
"$blink_core_output_dir/XMLNSNames.h", |
@@ -899,9 +865,7 @@ make_qualified_names("make_core_generated_xml_ns_names") { |
# "XMLNames" in make_core_generated from GYP. |
make_qualified_names("make_core_generated_xml_names") { |
- in_files = [ |
- "xml/xmlattrs.in", |
- ] |
+ in_files = [ "xml/xmlattrs.in" ] |
outputs = [ |
"$blink_core_output_dir/XMLNames.cpp", |
"$blink_core_output_dir/XMLNames.h", |
@@ -948,8 +912,8 @@ action("make_core_generated_private_script_for_testing") { |
script = "../build/scripts/make_private_script_source.py" |
inputs = [ |
- "testing/PartialPrivateScriptTest.js", |
- "testing/PrivateScriptTest.js", |
+ "testing/PartialPrivateScriptTest.js", |
+ "testing/PrivateScriptTest.js", |
] |
outputs = [ |
"$blink_core_output_dir/PrivateScriptSourcesForTesting.h", |
@@ -992,7 +956,8 @@ action("make_core_generated_css_tokenizer_codepoints") { |
] |
args = [ |
- "--output_dir", rel_blink_core_gen_dir, |
+ "--output_dir", |
+ rel_blink_core_gen_dir, |
] |
deps = make_core_generated_deps |
@@ -1006,10 +971,10 @@ action("make_core_generated_html_element_lookup_trie") { |
input_file = "html/HTMLTagNames.in" |
inputs = scripts_for_in_files + [ |
- input_file, |
- "../build/scripts/templates/ElementLookupTrie.cpp.tmpl", |
- "../build/scripts/templates/ElementLookupTrie.h.tmpl", |
- ] |
+ input_file, |
+ "../build/scripts/templates/ElementLookupTrie.cpp.tmpl", |
+ "../build/scripts/templates/ElementLookupTrie.h.tmpl", |
+ ] |
outputs = [ |
"$blink_core_output_dir/HTMLElementLookupTrie.cpp", |
"$blink_core_output_dir/HTMLElementLookupTrie.h", |
@@ -1017,7 +982,8 @@ action("make_core_generated_html_element_lookup_trie") { |
args = [ |
rebase_path(input_file, root_build_dir), |
- "--output_dir", rel_blink_core_gen_dir, |
+ "--output_dir", |
+ rel_blink_core_gen_dir, |
] |
deps = make_core_generated_deps |