Qualify the bindings include files and remove the bindings sub-dirs from build files.

BUG=381876
TBR=tkent for web

Review URL: https://codereview.chromium.org/355193003

git-svn-id: svn://svn.chromium.org/blink/trunk@177160 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/build/scripts/name_macros.py

@@ -131,8 +131,13 @@ class Writer(in_generator.Writer):
             # Avoid duplicate includes.
             if cpp_name in includes:
                 continue
-            include = '#include "%(path)s"\n#include "V8%(script_name)s.h"' % {
+            if self.suffix == "Modules":
+                subdir_name = 'modules'
+            else:
+                subdir_name = 'core'
+            include = '#include "%(path)s"\n#include "bindings/%(subdir_name)s/v8/V8%(script_name)s.h"' % {
                 'path': self._headers_header_include_path(entry),
+                'subdir_name': subdir_name,
                 'script_name': name_utilities.script_name(entry),
             }
             includes[cpp_name] = self.wrap_with_condition(include, entry['Conditional'])

third_party/WebKit/Source/build/scripts/templates/ElementWrapperFactory.cpp.tmpl

@@ -7,7 +7,7 @@
 #include "{{namespace}}Names.h"
 #include "bindings/v8/CustomElementWrapper.h"
 {% for tag in tags|sort if tag.has_js_interface %}
-#include "V8{{tag.interface}}.h"
+#include "bindings/core/v8/V8{{tag.interface}}.h"
 {% endfor %}
 {% for tag in tags|sort if tag.has_js_interface %}
 #include "core/{{namespace|lower}}/{{tag.js_interface}}.h"

third_party/WebKit/Source/build/scripts/templates/ElementWrapperFactory.h.tmpl

@@ -4,8 +4,8 @@
 #ifndef V8{{namespace}}ElementWrapperFactory_h
 #define V8{{namespace}}ElementWrapperFactory_h
 
-#include "V8{{namespace}}Element.h"
-#include "V8{{fallback_js_interface}}.h"
+#include "bindings/core/v8/V8{{namespace}}Element.h"
+#include "bindings/core/v8/V8{{fallback_js_interface}}.h"
 #include <v8.h>
 
 namespace WebCore {

third_party/WebKit/Source/core/BUILD.gn

@@ -41,10 +41,6 @@ config("core_include_dirs") {
   include_dirs = [
     "..",
     "../..",
-    # FIXME: Remove two lines below once core scripts generates qualified
-    # includes correctly: http://crbug.com/358074
-    bindings_core_v8_output_dir,
-    bindings_modules_v8_output_dir,
     "$root_gen_dir/blink",
   ]
   if (is_android && use_openmax_dl_fft) {

third_party/WebKit/Source/core/core.gyp

@@ -42,10 +42,6 @@
 
     'webcore_include_dirs': [
       '..',  # WebKit/Source
-      # FIXME: Remove the following two lines once core scripts generate qualified
-      # includes correctly: http://crbug.com/380054
-      '<(bindings_core_v8_output_dir)',
-      '<(bindings_modules_v8_output_dir)',
       '<(SHARED_INTERMEDIATE_DIR)/blink',  # gen/blink
     ],
 

third_party/WebKit/Source/modules/serviceworkers/RespondWithObserver.cpp

@@ -5,7 +5,7 @@
 #include "config.h"
 #include "modules/serviceworkers/RespondWithObserver.h"
 
-#include "V8Response.h"
+#include "bindings/modules/v8/V8Response.h"
 #include "bindings/v8/ScriptFunction.h"
 #include "bindings/v8/ScriptPromise.h"
 #include "bindings/v8/ScriptValue.h"

third_party/WebKit/Source/web/InspectorFrontendClientImpl.cpp

@@ -31,7 +31,7 @@
 #include "config.h"
 #include "web/InspectorFrontendClientImpl.h"
 
-#include "V8InspectorFrontendHost.h"
+#include "bindings/core/v8/V8InspectorFrontendHost.h"
 #include "bindings/v8/ScriptController.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/InspectorFrontendHost.h"

third_party/WebKit/Source/web/WebBindings.cpp

@@ -31,8 +31,8 @@
 #include "config.h"
 #include "public/web/WebBindings.h"
 
-#include "V8Element.h"
-#include "V8Range.h"
+#include "bindings/core/v8/V8Element.h"
+#include "bindings/core/v8/V8Range.h"
 #include "bindings/core/v8/custom/V8ArrayBufferCustom.h"
 #include "bindings/core/v8/custom/V8ArrayBufferViewCustom.h"
 #include "bindings/v8/NPV8Object.h"  // for PrivateIdentifier

third_party/WebKit/Source/web/WebBlob.cpp

@@ -31,7 +31,7 @@
 #include "config.h"
 #include "public/web/WebBlob.h"
 
-#include "V8Blob.h"
+#include "bindings/core/v8/V8Blob.h"
 #include "bindings/v8/V8Binding.h"
 #include "core/fileapi/Blob.h"
 #include "platform/blob/BlobData.h"

third_party/WebKit/Source/web/WebDOMError.cpp

@@ -31,7 +31,7 @@
 #include "config.h"
 #include "public/web/WebDOMError.h"
 
-#include "V8DOMError.h"
+#include "bindings/core/v8/V8DOMError.h"
 #include "bindings/v8/V8Binding.h"
 #include "core/dom/DOMError.h"
 #include "wtf/PassOwnPtr.h"

third_party/WebKit/Source/web/WebDOMFileSystem.cpp

@@ -31,9 +31,9 @@
 #include "config.h"
 #include "public/web/WebDOMFileSystem.h"
 
-#include "V8DOMFileSystem.h"
-#include "V8DirectoryEntry.h"
-#include "V8FileEntry.h"
+#include "bindings/modules/v8/V8DOMFileSystem.h"
+#include "bindings/modules/v8/V8DirectoryEntry.h"
+#include "bindings/modules/v8/V8FileEntry.h"
 #include "bindings/v8/WrapperTypeInfo.h"
 #include "core/dom/Document.h"
 #include "modules/filesystem/DOMFileSystem.h"

third_party/WebKit/Source/web/WebDOMMediaStreamTrack.cpp

@@ -31,7 +31,7 @@
 #include "config.h"
 #include "public/web/WebDOMMediaStreamTrack.h"
 
-#include "V8MediaStreamTrack.h"
+#include "bindings/modules/v8/V8MediaStreamTrack.h"
 #include "modules/mediastream/MediaStreamTrack.h"
 
 namespace blink {

third_party/WebKit/Source/web/WebDevToolsFrontendImpl.cpp

@@ -31,9 +31,9 @@
 #include "config.h"
 #include "web/WebDevToolsFrontendImpl.h"
 
-#include "V8InspectorFrontendHost.h"
-#include "V8MouseEvent.h"
-#include "V8Node.h"
+#include "bindings/core/v8/V8InspectorFrontendHost.h"
+#include "bindings/core/v8/V8MouseEvent.h"
+#include "bindings/core/v8/V8Node.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8DOMWrapper.h"

third_party/WebKit/Source/web/tests/CustomEventTest.cpp

@@ -30,7 +30,7 @@
 
 #include "config.h"
 
-#include "V8Event.h"
+#include "bindings/core/v8/V8Event.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 #include "bindings/v8/ScriptController.h"
 #include "bindings/v8/SerializedScriptValue.h"