| Index: Source/core/scripts/make_names.pl
|
| diff --git a/Source/core/scripts/make_names.pl b/Source/core/scripts/make_names.pl
|
| index 4b2995db0497eacfdad09ae1a41b89050aac6a76..cdc200aaf6df22b3015b90db275504ee7c2b9a4e 100755
|
| --- a/Source/core/scripts/make_names.pl
|
| +++ b/Source/core/scripts/make_names.pl
|
| @@ -39,6 +39,11 @@ use File::Spec;
|
| use IO::File;
|
| use InFilesParser;
|
|
|
| +use FindBin; # locate this script
|
| +use lib "$FindBin::Bin/../../../../../third_party/WebKit/Source/bindings/scripts"; # use the binding generator directory.
|
| +#use lib "$FindBin::Bin/../bindings/scripts"; # use the binding generator directory.
|
| +use idltopath;
|
| +
|
| sub readTags($$);
|
| sub readAttrs($$);
|
|
|
| @@ -626,7 +631,7 @@ sub printNamesHeaderFile
|
| open F, ">$headerPath";
|
|
|
| printLicenseHeader($F);
|
| - printHeaderHead($F, "DOM", $parameters{namespace}, "#include \"QualifiedName.h\"");
|
| + printHeaderHead($F, "DOM", $parameters{namespace}, "#include \"core/dom/QualifiedName.h\"");
|
|
|
| my $lowerNamespace = lc($parameters{namespacePrefix});
|
| print F "// Namespace\n";
|
| @@ -740,9 +745,10 @@ sub printJSElementIncludes
|
| }
|
| $tagsSeen{$JSInterfaceName} = 1;
|
|
|
| - print F "#include \"${wrapperFactoryType}${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/${wrapperFactoryType}${JSInterfaceName}.h\"\n";
|
| }
|
| - print F "#include \"${wrapperFactoryType}$parameters{fallbackInterfaceName}.h\"\n";
|
| + print F "#include \"bindings/${wrapperFactoryType}$parameters{fallbackInterfaceName}.h\"\n";
|
| }
|
|
|
| sub printElementIncludes
|
| @@ -759,7 +765,8 @@ sub printElementIncludes
|
| }
|
| $tagsSeen{$interfaceName} = 1;
|
|
|
| - print F "#include \"${interfaceName}.h\"\n";
|
| + my $includepath = idl_to_path($interfaceName);
|
| + print F "#include \"$includepath${interfaceName}.h\"\n";
|
| }
|
| print F "#include \"$parameters{fallbackInterfaceName}.h\"\n";
|
| }
|
| @@ -853,8 +860,8 @@ printConditionalElementIncludes($F);
|
|
|
| print F <<END
|
|
|
| -#include "ContextFeatures.h"
|
| -#include "RuntimeEnabledFeatures.h"
|
| +#include "core/dom/ContextFeatures.h"
|
| +#include "core/page/RuntimeEnabledFeatures.h"
|
|
|
| #if ENABLE(CUSTOM_ELEMENTS)
|
| #include "CustomElementConstructor.h"
|
| @@ -862,8 +869,8 @@ print F <<END
|
| #endif
|
|
|
| #if ENABLE(VIDEO)
|
| -#include "Document.h"
|
| -#include "Settings.h"
|
| +#include "core/dom/Document.h"
|
| +#include "core/page/Settings.h"
|
| #endif
|
|
|
| namespace WebCore {
|
| @@ -1186,12 +1193,12 @@ sub printWrapperFactoryCppFile
|
|
|
| print F <<END
|
|
|
| -#include "ContextFeatures.h"
|
| -#include "RuntimeEnabledFeatures.h"
|
| +#include "core/dom/ContextFeatures.h"
|
| +#include "core/page/RuntimeEnabledFeatures.h"
|
|
|
| #if ENABLE(VIDEO)
|
| -#include "Document.h"
|
| -#include "Settings.h"
|
| +#include "core/dom/Document.h"
|
| +#include "core/page/Settings.h"
|
| #endif
|
|
|
| END
|
| @@ -1202,7 +1209,7 @@ END
|
| #include "V8$parameters{namespace}Element.h"
|
|
|
| #if ENABLE(CUSTOM_ELEMENTS)
|
| -#include "CustomElementHelpers.h"
|
| +#include "bindings/v8/CustomElementHelpers.h"
|
| #endif
|
|
|
| #include <v8.h>
|
| @@ -1391,8 +1398,8 @@ sub printWrapperFactoryHeaderFile
|
|
|
| if ($wrapperFactoryType eq "V8") {
|
| 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 {
|
|
|