Work on blink GN bindings

Source/core/BUILD.gn

Index: Source/core/BUILD.gn
diff --git a/Source/core/BUILD.gn b/Source/core/BUILD.gn
index 2552acba7a557d6b1806a9759a41a041813844bf..1e89835dd782bdfa6b6acc018c04d8a7515878de 100644
--- a/Source/core/BUILD.gn
+++ b/Source/core/BUILD.gn
@@ -4,30 +4,55 @@
 
 import("//build/config/ui.gni")
 import("//third_party/WebKit/Source/bindings/bindings.gni")
+import("//third_party/WebKit/Source/bindings/core/v8/generated.gni")
+import("//third_party/WebKit/Source/bindings/modules/modules.gni")
+import("//third_party/WebKit/Source/bindings/modules/v8/generated.gni")
+import("//third_party/WebKit/Source/bindings/scripts/scripts.gni")
 import("//third_party/WebKit/Source/config.gni")
 import("//third_party/WebKit/Source/core/core.gni")
 import("//third_party/WebKit/Source/build/scripts/scripts.gni")
+import("//third_party/WebKit/Source/platform/platform_generated.gni")
+
+rel_blink_core_gen_dir = rebase_path(blink_core_output_dir, root_build_dir)
+
+# Compute the optimization level. The GYP code sets "optimize: max" which sets
+# speed-over-size optimization for official builds on Windows only. The GN's
+# build optimize_max config applies this optimization on all platforms, so
+# compute how to modify the config list to duplicate the GYP behavior.
+if (is_debug) {
+  core_config_remove = [ "//build/config/compiler:no_optimize" ]
+  core_config_add = core_config_remove  # NOP
+} else {
+  core_config_remove = [ "//build/config/compiler:optimize" ]
+
+  if (is_win && is_official_build) {
+    core_config_add = [ "//build/config/compiler:optimize_max" ]
+  } else {
+    core_config_add = core_config_remove  # NOP
+  }
+}
 
-blink_gen_dir = "$root_gen_dir/blink"
-# The blink_gen_dir relative to the root build directory. We use this a log.
-rel_blink_gen_dir = rebase_path(blink_gen_dir, root_build_dir)
-
-# TODO(GYP) when we add real targets to this file, don't forget to enable:
-#  - wexit_time_destructors
-#  - optimize: max (check what this does on Android before using).
+# Core targets also get wexit time destructors.
+core_config_add += [ "//build/config/compiler:wexit_time_destructors" ]
 
 config("core_include_dirs") {
   include_dirs = [
     "..",
     "../..",
-    blink_gen_dir,
-    bindings_output_dir,
+    # FIXME: Remove these once core scripts generates qualified
+    # includes correctly: http://crbug.com/358074
+    blink_core_output_dir,
+    blink_modules_output_dir,
+    blink_platform_output_dir,
+    bindings_core_v8_output_dir,
+    bindings_modules_v8_output_dir,
   ]
   if (is_android && use_openmax_dl_fft) {
     include_dirs += [ "//third_party/openmax_dl" ]
   }
 }
 
+# GYP version: WebKit/Source/core/core.gyp:webcore_generated
 source_set("generated") {
   deps = [
     ":make_core_generated",
@@ -38,44 +63,46 @@ source_set("generated") {
     "inspector:injected_script_source",
     "inspector:injected_canvas_script_source",
     "inspector:instrumentation_sources",
+    "//gin",
     "//skia",
     "//third_party/iccjpeg",
     "//third_party/libpng",
     "//third_party/libwebp",
+    "//third_party/libxml",
+    #"//third_party/libxslt",  # TODO(GYP)
+    "//third_party/npapi",
     "//third_party/qcms",
     "//third_party/sqlite",
-    "//third_party/WebKit/Source/bindings",
+    "//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",
+    "//third_party/WebKit/Source/platform:make_platform_generated",
     "//third_party/WebKit/Source/wtf",
     "//url",
-    # TODO(GYP)
-    #"//v8",
-    #'../platform/platform_generated.gyp:make_platform_generated',
-    #'<(DEPTH)/gin/gin.gyp:gin',
-    #'<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
-    #'<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt',
-    #'<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
+    "//v8",
   ]
 }
 
-# Corresponds to webcore_prerequisites in core.gyp.
+# GYP version: WebKit/Source/core/core.gyp:webcore_prerequisites
 source_set("prerequisites") {
   exported_deps = [
     "//third_party/WebKit/Source/wtf",
     "//gpu/command_buffer/client:gles2_c_lib",
     "//skia",
-    #'<(angle_path)/src/build_angle.gyp:translator',
+    "//third_party/angle:translator",
     "//third_party/iccjpeg",
     "//third_party/libpng",
     "//third_party/libwebp",
     "//third_party/libxml",
-    #"//third_party/libxslt",
-    #"//third_party/npapi",
+    #"//third_party/libxslt",  # TODO(GYP)
+    "//third_party/npapi",
     "//third_party/ots",
     "//third_party/qcms",
     "//third_party/sqlite",
     "//third_party/zlib",
     "//url",
-    #"//v8",
+    "//v8",
   ]
 
   deps = [
@@ -86,7 +113,9 @@ source_set("prerequisites") {
     "inspector:inspector_overlay_page",
     "inspector:protocol_sources",
     "inspector:instrumentation_sources",
-    "//third_party/WebKit/Source/bindings",
+    "//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",
   ] + exported_deps
 
@@ -101,23 +130,26 @@ source_set("prerequisites") {
   ]
 }
 
-# Corresponds to core.gyp:webcore
-#
 # Note that this is a source set rather than a group, even though it has no
 # sources. A group would implicitly forward all direct dependent configs
 # through it, but we want to keep our internal targets'
 # direct_dependent_configs private and only forward some of them.
+#
+# GYP version: WebKit/Source/core/core.gyp:webcore
 source_set("core") {
   exported_deps = [
     ":core_generated",
     "//skia",
-    #"//third_party/npapi",  # TODO(GYP)
+    "//third_party/npapi",
     "//third_party/qcms",
     "//third_party/WebKit/Source/wtf",
     "//url",
-    #"//v8",  # TODO(GYP)
+    "//v8",
   ]
 
+  configs -= core_config_remove
+  configs += core_config_add
+
   deps = [
     ":dom",
     ":html",
@@ -139,10 +171,13 @@ source_set("core") {
   # that creates a config used in both of these cases.
 }
 
-# webcore_dom in core.gyp
+# GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_dom
 source_set("dom") {
   sources = rebase_path(webcore_dom_files, ".", "//")
 
+  configs -= core_config_remove
+  configs += core_config_add
+
   if (is_win) {
     cflags = [ "/wd4267" ]  # size_t to int truncation.
   }
@@ -152,10 +187,13 @@ source_set("dom") {
   ]
 }
 
-# webcore_html in core.gyp
+# GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_html
 source_set("html") {
   sources = rebase_path(webcore_html_files, ".", "//")
 
+  configs -= core_config_remove
+  configs += core_config_add
+
   deps = [
     ":prerequisites",
   ]
@@ -168,10 +206,13 @@ source_set("html") {
   #}],
 }
 
-# webcore_svg in core.gyp
+# GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_svg
 source_set("svg") {
   sources = rebase_path(webcore_svg_files, ".", "//")
 
+  configs -= core_config_remove
+  configs += core_config_add
+
   deps = [
     ":prerequisites",
   ]
@@ -184,7 +225,7 @@ source_set("svg") {
   #}],
 }
 
-# webcore_remaining in core.gyp
+# GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_remaining
 source_set("remaining") {
   # This is currently a mashup of "webcore_rendering" and "webcore_remaining"
   # in GYP. The file list variable is the same and then GYP filters on wether
@@ -192,6 +233,9 @@ source_set("remaining") {
   # to separate out the rendering files.
   sources = rebase_path(webcore_files, ".", "//")
 
+  configs -= core_config_remove
+  configs += core_config_add
+
   cflags = []
   libs = []
 
@@ -249,14 +293,14 @@ source_set("remaining") {
   }
 }
 
-# webcore_rendering in core.gyp
+# GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_rendering
 source_set("rendering") {
   # The files that go here are currently in "remaining".
 }
 
-# webcore_generated from core.gyp
+# GYP version: //third_party/WebKit/Source/core/core.gyp:webcore_generated
 source_set("core_generated") {
-  sources = rebase_path(bindings_v8_files, ".", "../bindings/v8")
+  sources = bindings_v8_files
   # These files include all the .cpp files generated from the .idl files
   # in webcore_files.
   sources += bindings_core_generated_aggregate_files
@@ -341,6 +385,9 @@ source_set("core_generated") {
     "$root_gen_dir/blink/StyleBuilderFunctions.cpp",
   ]
 
+  configs -= core_config_remove
+  configs += core_config_add
+
   configs += [
     "..:inside_blink",
     # TODO(GYP) erase when v8 is ported.
@@ -357,34 +404,32 @@ source_set("core_generated") {
     "inspector:injected_canvas_script_source",
     "inspector:injected_script_source",
     "inspector:debugger_script_source",
-    #"//gin",  TODO(GYP)
+    "//gin",
     "//skia",
     "//third_party/iccjpeg",
     "//third_party/libpng",
     "//third_party/libwebp",
     "//third_party/libxml",
     #"//third_party/libxslt/libxslt.gyp:libxslt",  TODO(GYP)
-    #"//third_party/npapi",  TODO(GYP)
+    "//third_party/npapi",
     "//third_party/qcms",
     "//third_party/sqlite",
-    "//third_party/WebKit/Source/bindings",
-    # The GYP build does not have this dependency. But some of the bindings
-    # (like bindings/v8/custom/V8EventTargetCustom.cpp) include
-    # EventTargetModulesHeaders.h which is generated by make_modules_generated.
-    "//third_party/WebKit/Source/modules:make_modules_generated",
+    "//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",
     "//third_party/WebKit/Source/platform:make_platform_generated",
     "//third_party/WebKit/Source/wtf",
     "//url",
-    #"//v8",  TODO(GYP)
+    "//v8",
   ]
 
   configs += [ ":core_include_dirs" ]
   include_dirs = [
     "$root_gen_dir/blink",
-    "$bindings_output_dir",
     # FIXME: Remove these once the bindings script generates qualified
     # includes for these correctly. (Sequences don"t work yet.)
-    "$bindings_v8_dir/custom",
+    bindings_v8_custom_dir,
     "html",
     "html/shadow",
     "inspector",
@@ -420,8 +465,17 @@ source_set("core_generated") {
   #],
 }
 
+# core_bindings_generated ------------------------------------------------------
+
+# GYP version: WebKit/Source/core/core_generated.gyp:core_event_interfaces
+generate_event_interfaces("core_event_interfaces") {
+  sources = core_event_idl_files
+  output_file = "core/EventInterfaces.in"
+}
+
 # generated_testing_idls -------------------------------------------------------
 
+# GYP version: WebKit/Source/core/core_generated.gyp:generated_testing_idls
 group("generated_testing_idls") {
   deps = [
     ":generated_testing_idls_settings",
@@ -442,14 +496,15 @@ action("generated_testing_idls_settings") {
     "frame/Settings.in",
   ]
   outputs = [
-    "$blink_gen_dir/SettingsMacros.h",
-    "$blink_gen_dir/InternalSettingsGenerated.idl",
-    "$blink_gen_dir/InternalSettingsGenerated.cpp",
+    "$blink_core_output_dir/SettingsMacros.h",
+    "$blink_core_output_dir/InternalSettingsGenerated.idl",
+    "$blink_core_output_dir/InternalSettingsGenerated.cpp",
+    "$blink_core_output_dir/InternalSettingsGenerated.h",
   ]
 
   args = [
     rebase_path("frame/Settings.in", root_build_dir),
-    "--output_dir", rel_blink_gen_dir,
+    "--output_dir", rel_blink_core_gen_dir,
   ]
 }
 
@@ -464,24 +519,29 @@ action("generated_testing_idls_internal_runtime_flags") {
     "../build/scripts/templates/InternalRuntimeFlags.idl.tmpl",
   ]
   outputs = [
-    "$blink_gen_dir/InternalRuntimeFlags.idl",
-    "$blink_gen_dir/InternalRuntimeFlags.h",
+    "$blink_core_output_dir/InternalRuntimeFlags.idl",
+    "$blink_core_output_dir/InternalRuntimeFlags.h",
   ]
 
   args = [
     rebase_path("../platform/RuntimeEnabledFeatures.in", root_build_dir),
-    "--output_dir", rel_blink_gen_dir,
+    "--output_dir", rel_blink_core_gen_dir,
   ]
 }
 
 # make_core_generated ----------------------------------------------------------
 
+# GYP version: WebKit/Source/core/core_generated.gyp:make_core_generated
 group("make_core_generated") {
   deps = [
     ":make_core_generated_xml_viewer_css",
+    ":make_core_generated_xml_viewer_js",
+    ":make_core_generated_html_entity_table",
     ":make_core_generated_css_property_names",
     ":make_core_generated_media_feature_names",
     ":make_core_generated_media_features",
+    ":make_core_generated_media_type_names",
+    ":make_core_generated_media_query_tokenizer_codepoints",
     ":make_core_generated_style_property_shorthand",
     ":make_core_generated_style_builder",
     ":make_core_generated_css_value_keywords",
@@ -490,25 +550,21 @@ group("make_core_generated") {
     ":make_core_generated_svg_names",
     ":make_core_generated_svg_element_type_helpers",
     ":make_core_generated_event_factory",
-    ":make_core_generated_event_target_factory",
-    ":make_core_generated_media_type_names",
     ":make_core_generated_event_names",
+    ":make_core_generated_event_target_factory",
     ":make_core_generated_event_target_names",
+    ":make_core_generated_math_ml_names",
+    ":make_core_generated_user_agent_style_sheets",
     ":make_core_generated_fetch_initiator_type_names",
     ":make_core_generated_event_type_names",
     ":make_core_generated_html_tokenizer_names",
     ":make_core_generated_input_type_names",
-    ":make_core_generated_math_ml_names",
     ":make_core_generated_xlink_names",
+    ":make_core_generated_xml_ns_names",
     ":make_core_generated_xml_names",
     ":make_core_generated_make_token_matcher",
     ":make_core_generated_make_parser",
     ":make_core_generated_make_token_matcher_for_viewport",
-    ":make_core_generated_xml_viewer_css",
-    ":make_core_generated_xml_viewer_js",
-    ":make_core_generated_html_entity_table",
-    ":make_core_generated_media_query_tokenizer_codepoints",
-    ":make_core_generated_user_agent_style_sheets",
     ":make_core_generated_html_element_lookup_trie",
     ":make_core_generated_bison",
   ]
@@ -522,8 +578,8 @@ process_in_files("make_core_generated_css_property_names") {
     "css/SVGCSSPropertyNames.in",
   ]
   outputs = [
-    "CSSPropertyNames.cpp",
-    "CSSPropertyNames.h",
+    "$blink_core_output_dir/CSSPropertyNames.cpp",
+    "$blink_core_output_dir/CSSPropertyNames.h",
   ]
   other_args = [ "--defines", feature_defines_string ]
 }
@@ -539,7 +595,7 @@ process_in_files("make_core_generated_media_features") {
     "../build/scripts/templates/MediaFeatures.h.tmpl",
   ]
   outputs = [
-    "MediaFeatures.h",
+    "$blink_core_output_dir/MediaFeatures.h",
   ]
   other_args = [ "--defines", feature_defines_string ]
 }
@@ -555,8 +611,8 @@ process_in_files("make_core_generated_style_property_shorthand") {
     "../build/scripts/templates/StylePropertyShorthand.h.tmpl",
   ]
   outputs = [
-    "StylePropertyShorthand.cpp",
-    "StylePropertyShorthand.h",
+    "$blink_core_output_dir/StylePropertyShorthand.cpp",
+    "$blink_core_output_dir/StylePropertyShorthand.h",
   ]
 }
 
@@ -573,9 +629,9 @@ process_in_files("make_core_generated_style_builder") {
     "../build/scripts/templates/StyleBuilderFunctions.h.tmpl",
   ]
   outputs = [
-    "StyleBuilder.cpp",
-    "StyleBuilderFunctions.h",
-    "StyleBuilderFunctions.cpp",
+    "$blink_core_output_dir/StyleBuilder.cpp",
+    "$blink_core_output_dir/StyleBuilderFunctions.h",
+    "$blink_core_output_dir/StyleBuilderFunctions.cpp",
   ]
 }
 
@@ -588,8 +644,8 @@ process_in_files("make_core_generated_css_value_keywords") {
     "css/SVGCSSValueKeywords.in",
   ]
   outputs = [
-    "CSSValueKeywords.cpp",
-    "CSSValueKeywords.h",
+    "$blink_core_output_dir/CSSValueKeywords.cpp",
+    "$blink_core_output_dir/CSSValueKeywords.h",
   ]
   other_args = [
     "--gperf", gperf_exe,
@@ -607,12 +663,12 @@ process_in_files("make_core_generated_html_element_factory") {
   ]
   other_inputs = make_element_factory_files
   outputs = [
-    "HTMLElementFactory.cpp",
-    "HTMLElementFactory.h",
-    "HTMLNames.cpp",
-    "HTMLNames.h",
-    "V8HTMLElementWrapperFactory.cpp",
-    "V8HTMLElementWrapperFactory.h",
+    "$blink_core_output_dir/HTMLElementFactory.cpp",
+    "$blink_core_output_dir/HTMLElementFactory.h",
+    "$blink_core_output_dir/HTMLNames.cpp",
+    "$blink_core_output_dir/HTMLNames.h",
+    "$blink_core_output_dir/V8HTMLElementWrapperFactory.cpp",
+    "$blink_core_output_dir/V8HTMLElementWrapperFactory.h",
   ]
 }
 
@@ -625,7 +681,7 @@ process_in_files("make_core_generated_html_element_type_helpers") {
   ]
   other_inputs = make_element_type_helpers_files
   outputs = [
-    "HTMLElementTypeHelpers.h",
+    "$blink_core_output_dir/HTMLElementTypeHelpers.h",
   ]
 }
 
@@ -639,12 +695,12 @@ process_in_files("make_core_generated_svg_names") {
   ]
   other_inputs = make_element_factory_files
   outputs = [
-    "SVGElementFactory.cpp",
-    "SVGElementFactory.h",
-    "SVGNames.cpp",
-    "SVGNames.h",
-    "V8SVGElementWrapperFactory.cpp",
-    "V8SVGElementWrapperFactory.h",
+    "$blink_core_output_dir/SVGElementFactory.cpp",
+    "$blink_core_output_dir/SVGElementFactory.h",
+    "$blink_core_output_dir/SVGNames.cpp",
+    "$blink_core_output_dir/SVGNames.h",
+    "$blink_core_output_dir/V8SVGElementWrapperFactory.cpp",
+    "$blink_core_output_dir/V8SVGElementWrapperFactory.h",
   ]
 }
 
@@ -657,7 +713,7 @@ process_in_files("make_core_generated_svg_element_type_helpers") {
   ]
   other_inputs = make_element_type_helpers_files
   outputs = [
-    "SVGElementTypeHelpers.h",
+    "$blink_core_output_dir/SVGElementTypeHelpers.h",
   ]
 }
 
@@ -666,14 +722,14 @@ process_in_files("make_core_generated_event_factory") {
   script = "../build/scripts/make_event_factory.py"
 
   in_files = [
-    "$blink_gen_dir/EventInterfaces.in",
+    "$blink_core_output_dir/EventInterfaces.in",
     "events/EventAliases.in",
   ]
   other_inputs = make_event_factory_files
   outputs = [
-    "Event.cpp",
-    "EventHeaders.h",
-    "EventInterfaces.h",
+    "$blink_core_output_dir/Event.cpp",
+    "$blink_core_output_dir/EventHeaders.h",
+    "$blink_core_output_dir/EventInterfaces.h",
   ]
 }
 
@@ -685,8 +741,8 @@ make_event_factory("make_core_generated_event_target_factory") {
     "events/EventTargetFactory.in",
   ]
   outputs = [
-    "EventTargetHeaders.h",
-    "EventTargetInterfaces.h",
+    "$blink_core_output_dir/EventTargetHeaders.h",
+    "$blink_core_output_dir/EventTargetInterfaces.h",
   ]
 }
 
@@ -698,8 +754,8 @@ process_in_files("make_core_generated_media_feature_names") {
   ]
   other_inputs = make_names_files
   outputs = [
-    "MediaFeatureNames.cpp",
-    "MediaFeatureNames.h",
+    "$blink_core_output_dir/MediaFeatureNames.cpp",
+    "$blink_core_output_dir/MediaFeatureNames.h",
   ]
   other_args = [ "--defines", feature_defines_string ]
 }
@@ -712,19 +768,19 @@ make_names("make_core_generated_media_type_names") {
     "css/MediaTypeNames.in",
   ]
   outputs = [
-    "MediaTypeNames.cpp",
-    "MediaTypeNames.h",
+    "$blink_core_output_dir/MediaTypeNames.cpp",
+    "$blink_core_output_dir/MediaTypeNames.h",
   ]
 }
 
 # "EventNames" in make_core_generated from GYP.
 make_names("make_core_generated_event_names") {
   in_files = [
-    "$blink_gen_dir/EventInterfaces.in",
+    "$blink_core_output_dir/EventInterfaces.in",
   ]
   outputs = [
-    "EventNames.cpp",
-    "EventNames.h",
+    "$blink_core_output_dir/EventNames.cpp",
+    "$blink_core_output_dir/EventNames.h",
   ]
 }
 
@@ -734,8 +790,8 @@ make_names("make_core_generated_event_target_names") {
     "events/EventTargetFactory.in",
   ]
   outputs = [
-    "EventTargetNames.cpp",
-    "EventTargetNames.h",
+    "$blink_core_output_dir/EventTargetNames.cpp",
+    "$blink_core_output_dir/EventTargetNames.h",
   ]
 }
 
@@ -745,8 +801,8 @@ make_names("make_core_generated_fetch_initiator_type_names") {
     "fetch/FetchInitiatorTypeNames.in",
   ]
   outputs = [
-    "FetchInitiatorTypeNames.cpp",
-    "FetchInitiatorTypeNames.h",
+    "$blink_core_output_dir/FetchInitiatorTypeNames.cpp",
+    "$blink_core_output_dir/FetchInitiatorTypeNames.h",
   ]
 }
 
@@ -756,8 +812,8 @@ make_names("make_core_generated_event_type_names") {
     "events/EventTypeNames.in",
   ]
   outputs = [
-    "EventTypeNames.cpp",
-    "EventTypeNames.h",
+    "$blink_core_output_dir/EventTypeNames.cpp",
+    "$blink_core_output_dir/EventTypeNames.h",
   ]
 }
 
@@ -767,8 +823,8 @@ make_names("make_core_generated_html_tokenizer_names") {
     "html/parser/HTMLTokenizerNames.in",
   ]
   outputs = [
-    "HTMLTokenizerNames.cpp",
-    "HTMLTokenizerNames.h",
+    "$blink_core_output_dir/HTMLTokenizerNames.cpp",
+    "$blink_core_output_dir/HTMLTokenizerNames.h",
   ]
 }
 
@@ -778,8 +834,8 @@ make_names("make_core_generated_input_type_names") {
     "html/forms/InputTypeNames.in",
   ]
   outputs = [
-    "InputTypeNames.cpp",
-    "InputTypeNames.h",
+    "$blink_core_output_dir/InputTypeNames.cpp",
+    "$blink_core_output_dir/InputTypeNames.h",
   ]
 }
 
@@ -792,8 +848,8 @@ make_qualified_names("make_core_generated_math_ml_names") {
     "html/parser/MathMLAttributeNames.in",
   ]
   outputs = [
-    "MathMLNames.cpp",
-    "MathMLNames.h",
+    "$blink_core_output_dir/MathMLNames.cpp",
+    "$blink_core_output_dir/MathMLNames.h",
   ]
 }
 
@@ -803,8 +859,8 @@ make_qualified_names("make_core_generated_xlink_names") {
     "svg/xlinkattrs.in",
   ]
   outputs = [
-    "XLinkNames.cpp",
-    "XLinkNames.h",
+    "$blink_core_output_dir/XLinkNames.cpp",
+    "$blink_core_output_dir/XLinkNames.h",
   ]
 }
 
@@ -814,8 +870,8 @@ make_qualified_names("make_core_generated_xml_ns_names") {
     "xml/xmlnsattrs.in",
   ]
   outputs = [
-    "XMLNSNames.cpp",
-    "XMLNSNames.h",
+    "$blink_core_output_dir/XMLNSNames.cpp",
+    "$blink_core_output_dir/XMLNSNames.h",
   ]
 }
 
@@ -825,8 +881,8 @@ make_qualified_names("make_core_generated_xml_names") {
     "xml/xmlattrs.in",
   ]
   outputs = [
-    "XMLNames.cpp",
-    "XMLNames.h",
+    "$blink_core_output_dir/XMLNames.cpp",
+    "$blink_core_output_dir/XMLNames.h",
   ]
 }
 
@@ -835,19 +891,19 @@ make_qualified_names("make_core_generated_xml_names") {
 # "MakeTokenMatcher" in make_core_generated from GYP.
 make_token_matcher("make_core_generated_make_token_matcher") {
   input_file = "css/CSSTokenizer-in.cpp"
-  output_file = "CSSTokenizer.cpp"
+  output_file = "$blink_core_output_dir/CSSTokenizer.cpp"
 }
 
 # "MakeParser" in make_core_generated from GYP.
 make_token_matcher("make_core_generated_make_parser") {
   input_file = "css/parser/BisonCSSParser-in.cpp"
-  output_file = "BisonCSSParser.cpp"
+  output_file = "$blink_core_output_dir/BisonCSSParser.cpp"
 }
 
 # "MakeTokenMatcherForViewport" in make_core_generated from GYP.
 make_token_matcher("make_core_generated_make_token_matcher_for_viewport") {
   input_file = "html/HTMLMetaElement-in.cpp"
-  output_file = "HTMLMetaElement.cpp"
+  output_file = "$blink_core_output_dir/HTMLMetaElement.cpp"
 }
 
 # One-off scripts --------------------------------------------------------------
@@ -861,7 +917,7 @@ action("make_core_generated_xml_viewer_css") {
     "xml/XMLViewer.css",
   ]
   outputs = [
-    "$blink_gen_dir/XMLViewerCSS.h",
+    "$blink_core_output_dir/XMLViewerCSS.h",
   ]
 
   args = [
@@ -882,7 +938,7 @@ action("make_core_generated_xml_viewer_js") {
     "xml/XMLViewer.js",
   ]
   outputs = [
-    "$blink_gen_dir/XMLViewerJS.h",
+    "$blink_core_output_dir/XMLViewerJS.h",
   ]
 
   args = [
@@ -903,7 +959,7 @@ action("make_core_generated_html_entity_table") {
     "html/parser/HTMLEntityNames.in",
   ]
   outputs = [
-    "$blink_gen_dir/HTMLEntityTable.cpp",
+    "$blink_core_output_dir/HTMLEntityTable.cpp",
   ]
 
   args = [ "-o" ] + rebase_path(outputs, root_build_dir) 
@@ -918,11 +974,11 @@ action("make_core_generated_media_query_tokenizer_codepoints") {
   script = "../build/scripts/make_mediaquery_tokenizer_codepoints.py"
 
   outputs = [
-    "$blink_gen_dir/MediaQueryTokenizerCodepoints.cpp",
+    "$blink_core_output_dir/MediaQueryTokenizerCodepoints.cpp",
   ]
 
   args = [
-    "--output_dir", rel_blink_gen_dir,
+    "--output_dir", rel_blink_core_gen_dir,
     "--defines", feature_defines_string
   ]
 
@@ -961,8 +1017,8 @@ action("make_core_generated_user_agent_style_sheets") {
 
   source_prereqs = scripts + stylesheets
   outputs = [
-    "$blink_gen_dir/UserAgentStyleSheets.h",
-    "$blink_gen_dir/UserAgentStyleSheetsData.cpp",
+    "$blink_core_output_dir/UserAgentStyleSheets.h",
+    "$blink_core_output_dir/UserAgentStyleSheetsData.cpp",
   ]
 
   args =
@@ -989,13 +1045,13 @@ action("make_core_generated_html_element_lookup_trie") {
     "../build/scripts/templates/ElementLookupTrie.h.tmpl",
   ]
   outputs = [
-    "$blink_gen_dir/HTMLElementLookupTrie.cpp",
-    "$blink_gen_dir/HTMLElementLookupTrie.h",
+    "$blink_core_output_dir/HTMLElementLookupTrie.cpp",
+    "$blink_core_output_dir/HTMLElementLookupTrie.h",
   ]
 
   args = [
     rebase_path(input_file, root_build_dir),
-    "--output_dir", rel_blink_gen_dir,
+    "--output_dir", rel_blink_core_gen_dir,
   ]
 
   deps = make_core_generated_deps
@@ -1009,12 +1065,12 @@ action_foreach("make_core_generated_bison") {
     "xml/XPathGrammar.y",
   ]
   outputs = [
-    "$blink_gen_dir/{{source_name_part}}.cpp",
-    "$blink_gen_dir/{{source_name_part}}.h",
+    "$blink_core_output_dir/{{source_name_part}}.cpp",
+    "$blink_core_output_dir/{{source_name_part}}.h",
   ]
   args = [
     "{{source}}",
-    rel_blink_gen_dir,
+    rel_blink_core_gen_dir,
     bison_exe,
   ]