Fixes to make scripts generate includes with paths.

Source/core/scripts/make_names.pl

Index: Source/core/scripts/make_names.pl
diff --git a/Source/core/scripts/make_names.pl b/Source/core/scripts/make_names.pl
index 27316bd61dee95b23f8da2740b4c07814ef7a50d..1fae951ef6b07104cda468ec7d2555f4ee8fb7d0 100755
--- a/Source/core/scripts/make_names.pl
+++ b/Source/core/scripts/make_names.pl
@@ -38,11 +38,13 @@ use File::Path;
 use File::Spec;
 use IO::File;
 use InFilesParser;
+use idltopath;
 
 sub readTags($$);
 sub readAttrs($$);
 
 my $printFactory = 0; 
+my $idlToPathFile = "";
 my $fontNamesIn = "";
 my $tagsFile = "";
 my $attrsFile = "";
@@ -78,9 +80,12 @@ GetOptions(
     'outputDir=s' => \$outputDir,
     'extraDefines=s' => \$extraDefines,
     'preprocessor=s' => \$preprocessor,
+    'idltopathfile=s' => \$idlToPathFile,
     'fonts=s' => \$fontNamesIn
 );
 
+initIdlToPath($idlToPathFile);
+
 mkpath($outputDir);
 
 if (length($fontNamesIn)) {
@@ -538,7 +543,7 @@ sub printCppHead
     print F "#define QNAME_DEFAULT_CONSTRUCTOR 1\n";
     print F "#endif\n\n";
 
-    print F "#include \"${nsName}Names.h\"\n\n";
+    print F "#include \"./././${nsName}Names.h\"\n\n";
     print F "#include <wtf/StaticConstructors.h>\n";
 
     print F "namespace WebCore {\n\n";
@@ -725,9 +730,10 @@ sub printJSElementIncludes
         }
         $tagsSeen{$JSInterfaceName} = 1;
 
-        print F "#include \"V8${JSInterfaceName}.h\"\n";
+        # V8HTMLElementWrapperFactory.cpp that uses this code is generated into "webkit" and for instance V8HTMLAnchorElement.h is in "webkit/bindings"
+        print F "#include \"bindings/V8${JSInterfaceName}.h\"\n";
     }
-    print F "#include \"V8$parameters{fallbackInterfaceName}.h\"\n";
+    print F "#include \"bindings/V8$parameters{fallbackInterfaceName}.h\"\n";
 }
 
 sub printElementIncludes
@@ -744,9 +750,14 @@ sub printElementIncludes
         }
         $tagsSeen{$interfaceName} = 1;
 
-        print F "#include \"${interfaceName}.h\"\n";
+        my $includepath = idlToPath($interfaceName);
+        print F "#include \"$includepath${interfaceName}.h\"\n";
+    }
+    my $fallbackInterface = $parameters{fallbackInterfaceName};
+    if ($fallbackInterface) {
+        my $fallbackInterfacePath = idlToPath($fallbackInterface);
+        print F "#include \"$fallbackInterfacePath$fallbackInterface.h\"\n";
     }
-    print F "#include \"$parameters{fallbackInterfaceName}.h\"\n";
 }
 
 sub printConditionalElementIncludes
@@ -775,7 +786,8 @@ sub printConditionalElementIncludes
         print F "\n#if ENABLE($conditional)\n";
         for my $interfaceName (sort keys %{$conditionals{$conditional}{interfaceNames}}) {
             next if $unconditionalElementIncludes{$interfaceName};
-            print F "#include \"$interfaceName.h\"\n";
+            my $interfacePath = idlToPath($interfaceName);
+            print F "#include \"$interfacePath/$interfaceName.h\"\n";
         }
         if ($shouldIncludeV8Headers) {
             for my $JSInterfaceName (sort keys %{$conditionals{$conditional}{JSInterfaceNames}}) {
@@ -838,10 +850,10 @@ printConditionalElementIncludes($F);
 
 print F <<END
 
-#include "ContextFeatures.h"
-#include "Document.h"
+#include "core/dom/ContextFeatures.h"
+#include "core/dom/Document.h"
+#include "core/page/Settings.h"
 #include "RuntimeEnabledFeatures.h"
-#include "Settings.h"
 
 #include "CustomElementRegistry.h"
 
@@ -1101,10 +1113,10 @@ sub printWrapperFactoryCppFile
 
     print F <<END
 
-#include "ContextFeatures.h"
-#include "Document.h"
+#include "core/dom/ContextFeatures.h"
+#include "core/dom/Document.h"
+#include "core/page/Settings.h"
 #include "RuntimeEnabledFeatures.h"
-#include "Settings.h"
 
 #include "V8$parameters{namespace}Element.h"
 
@@ -1240,8 +1252,8 @@ sub printWrapperFactoryHeaderFile
     print F "#if $parameters{guardFactoryWith}\n" if $parameters{guardFactoryWith};
 
     print F <<END
-#include <V8$parameters{namespace}Element.h>
-#include <V8$parameters{fallbackInterfaceName}.h>
+#include "bindings/V8$parameters{namespace}Element.h"
+#include "bindings/V8$parameters{fallbackInterfaceName}.h"
 #include <v8.h>
 
 namespace WebCore {