[GTK] Install GObject DOM bindings headers in its own directory
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Dec 2012 17:58:03 +0000 (17:58 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 11 Dec 2012 17:58:03 +0000 (17:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=104663

Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2012-12-11
Reviewed by Gustavo Noronha Silva.

.:

* GNUmakefile.am: Add GENSOURCES_WEBKITDOM and
webkitgtk_gdom_built_h_api variables.

Source/WebCore:

Move the headers from webkit to webkitdom directory.

* bindings/gobject/GNUmakefile.am:
* bindings/gobject/WebKitDOMBinding.h:
* bindings/gobject/WebKitDOMCustom.h:
* bindings/gobject/WebKitDOMEventTarget.h:
* bindings/gobject/WebKitDOMEventTargetPrivate.h:
* bindings/gobject/WebKitDOMObject.h:
* bindings/scripts/CodeGeneratorGObject.pm:
(Generate):
(WriteData):
* bindings/scripts/gobject-generate-headers.pl:
* bindings/scripts/test/GObject/WebKitDOMFloat64Array.h:
* bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h:
* bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
* bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h:
* bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h:
* bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
* bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestException.h:
* bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
* bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h:
* bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h:
* bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestNode.h:
* bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestObj.h:
* bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h:
* bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructorsPrivate.h:
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
* bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h:

Source/WebKit/gtk:

* GNUmakefile.am: Add webkitdom.h.
* webkit/webkitdom.h: Compatibility header just including the new
one.
* webkit/webkitwebframe.cpp: Update includes.
* webkit/webkitwebframe.h: Ditto.
* webkit/webkitwebinspector.cpp: Ditto.
* webkit/webkitwebinspector.h: Ditto.
* webkit/webkitwebview.cpp: Ditto.
* webkit/webkitwebview.h: Ditto.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137329 268f45cc-cd09-0410-ab3c-d52691b4dbfc

48 files changed:
ChangeLog
GNUmakefile.am
Source/WebCore/ChangeLog
Source/WebCore/bindings/gobject/GNUmakefile.am
Source/WebCore/bindings/gobject/WebKitDOMBinding.h
Source/WebCore/bindings/gobject/WebKitDOMCustom.h
Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h
Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h
Source/WebCore/bindings/gobject/WebKitDOMObject.h
Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
Source/WebCore/bindings/scripts/gobject-generate-headers.pl
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructorsPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/GNUmakefile.am
Source/WebKit/gtk/webkit/webkitdom.h [new file with mode: 0644]
Source/WebKit/gtk/webkit/webkitwebframe.cpp
Source/WebKit/gtk/webkit/webkitwebframe.h
Source/WebKit/gtk/webkit/webkitwebinspector.cpp
Source/WebKit/gtk/webkit/webkitwebinspector.h
Source/WebKit/gtk/webkit/webkitwebview.cpp
Source/WebKit/gtk/webkit/webkitwebview.h

index d1ba365..82ed5e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-12-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Install GObject DOM bindings headers in its own directory
+        https://bugs.webkit.org/show_bug.cgi?id=104663
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * GNUmakefile.am: Add GENSOURCES_WEBKITDOM and
+        webkitgtk_gdom_built_h_api variables.
+
 2012-12-11  Stephen Kelly  <stephen.kelly@kdab.com>
 
         WebKit tests for the Qt API should include tests of CMake config files
index 52384c6..dbf4bbf 100644 (file)
@@ -36,6 +36,7 @@ GENSOURCES_JAVASCRIPTCORE := $(top_builddir)/DerivedSources/JavaScriptCore
 GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
 GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
 GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
+GENSOURCES_WEBKITDOM := $(top_builddir)/DerivedSources/webkitdom
 GENPROGRAMS := $(top_builddir)/Programs
 GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
 WebCore := $(srcdir)/Source/WebCore
@@ -89,6 +90,7 @@ webkitgtk_static_h_api :=
 webkitgtk_h_api :=
 webkitgtk_sources :=
 webkitgtk_cppflags :=
+webkitgtk_gdom_built_h_api :=
 webkitgtk_gdom_built_sources :=
 webkitgtk_built_sources :=
 webkitgtk_built_nosources :=
index 83f3dba..6e81846 100644 (file)
@@ -1,3 +1,51 @@
+2012-12-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Install GObject DOM bindings headers in its own directory
+        https://bugs.webkit.org/show_bug.cgi?id=104663
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Move the headers from webkit to webkitdom directory.
+
+        * bindings/gobject/GNUmakefile.am:
+        * bindings/gobject/WebKitDOMBinding.h:
+        * bindings/gobject/WebKitDOMCustom.h:
+        * bindings/gobject/WebKitDOMEventTarget.h:
+        * bindings/gobject/WebKitDOMEventTargetPrivate.h:
+        * bindings/gobject/WebKitDOMObject.h:
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (Generate):
+        (WriteData):
+        * bindings/scripts/gobject-generate-headers.pl:
+        * bindings/scripts/test/GObject/WebKitDOMFloat64Array.h:
+        * bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestException.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestNode.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructors.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestOverloadedConstructorsPrivate.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
+        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h:
+
 2012-12-11  Mark Pilgrim  <pilgrim@chromium.org>
 
         [Chromium] Clean up unused interfaces in PlatformSupport
index 3c7134a..0531bd8 100644 (file)
 webkitgtk_gdom_built_sources += \
-       DerivedSources/webkit/WebKitDOMAttr.cpp \
-       DerivedSources/webkit/WebKitDOMAttrPrivate.h \
-       DerivedSources/webkit/WebKitDOMBarInfo.cpp \
-       DerivedSources/webkit/WebKitDOMBarInfoPrivate.h \
-       DerivedSources/webkit/WebKitDOMBlob.cpp \
-       DerivedSources/webkit/WebKitDOMBlobPrivate.h \
-       DerivedSources/webkit/WebKitDOMCDATASection.cpp \
-       DerivedSources/webkit/WebKitDOMCDATASectionPrivate.h \
-       DerivedSources/webkit/WebKitDOMCharacterData.cpp \
-       DerivedSources/webkit/WebKitDOMCharacterDataPrivate.h \
-       DerivedSources/webkit/WebKitDOMComment.cpp \
-       DerivedSources/webkit/WebKitDOMCommentPrivate.h \
-       DerivedSources/webkit/WebKitDOMConsole.cpp \
-       DerivedSources/webkit/WebKitDOMConsolePrivate.h \
-       DerivedSources/webkit/WebKitDOMCSSRule.cpp \
-       DerivedSources/webkit/WebKitDOMCSSRuleList.cpp \
-       DerivedSources/webkit/WebKitDOMCSSRuleListPrivate.h \
-       DerivedSources/webkit/WebKitDOMCSSRulePrivate.h \
-       DerivedSources/webkit/WebKitDOMCSSStyleDeclaration.cpp \
-       DerivedSources/webkit/WebKitDOMCSSStyleDeclarationPrivate.h \
-       DerivedSources/webkit/WebKitDOMCSSStyleSheet.cpp \
-       DerivedSources/webkit/WebKitDOMCSSStyleSheetPrivate.h \
-       DerivedSources/webkit/WebKitDOMCSSValue.cpp \
-       DerivedSources/webkit/WebKitDOMCSSValuePrivate.h \
-       DerivedSources/webkit/WebKitDOMDatabase.cpp \
-       DerivedSources/webkit/WebKitDOMDatabasePrivate.h \
-       DerivedSources/webkit/WebKitDOMDocument.cpp \
-       DerivedSources/webkit/WebKitDOMDocumentFragment.cpp \
-       DerivedSources/webkit/WebKitDOMDocumentFragmentPrivate.h \
-       DerivedSources/webkit/WebKitDOMDocumentPrivate.h \
-       DerivedSources/webkit/WebKitDOMDocumentType.cpp \
-       DerivedSources/webkit/WebKitDOMDocumentTypePrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMApplicationCache.cpp \
-       DerivedSources/webkit/WebKitDOMDOMApplicationCachePrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMImplementation.cpp \
-       DerivedSources/webkit/WebKitDOMDOMImplementationPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMMimeTypeArray.cpp \
-       DerivedSources/webkit/WebKitDOMDOMMimeTypeArrayPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMMimeType.cpp \
-       DerivedSources/webkit/WebKitDOMDOMMimeTypePrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMNamedFlowCollection.cpp \
-       DerivedSources/webkit/WebKitDOMDOMPluginArray.cpp \
-       DerivedSources/webkit/WebKitDOMDOMPluginArrayPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMPlugin.cpp \
-       DerivedSources/webkit/WebKitDOMDOMPluginPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMSecurityPolicy.cpp \
-       DerivedSources/webkit/WebKitDOMDOMSecurityPolicyPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMSelection.cpp \
-       DerivedSources/webkit/WebKitDOMDOMSelectionPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMStringList.cpp \
-       DerivedSources/webkit/WebKitDOMDOMStringListPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMStringMap.cpp \
-       DerivedSources/webkit/WebKitDOMDOMStringMapPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMSettableTokenList.cpp \
-       DerivedSources/webkit/WebKitDOMDOMSettableTokenListPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMTokenList.cpp \
-       DerivedSources/webkit/WebKitDOMDOMTokenListPrivate.h \
-       DerivedSources/webkit/WebKitDOMDOMWindow.cpp \
-       DerivedSources/webkit/WebKitDOMDOMWindowPrivate.h \
-       DerivedSources/webkit/WebKitDOMElement.cpp \
-       DerivedSources/webkit/WebKitDOMElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMEntityReference.cpp \
-       DerivedSources/webkit/WebKitDOMEntityReferencePrivate.h \
-       DerivedSources/webkit/WebKitDOMEvent.cpp \
-       DerivedSources/webkit/WebKitDOMEventPrivate.h \
-       DerivedSources/webkit/WebKitDOMEventTargetPrivate.h \
-       DerivedSources/webkit/WebKitDOMFile.cpp \
-       DerivedSources/webkit/WebKitDOMFileList.cpp \
-       DerivedSources/webkit/WebKitDOMFileListPrivate.h \
-       DerivedSources/webkit/WebKitDOMFilePrivate.h \
-       DerivedSources/webkit/WebKitDOMGamepad.cpp \
-       DerivedSources/webkit/WebKitDOMGamepadList.cpp \
-       DerivedSources/webkit/WebKitDOMGamepadListPrivate.h \
-       DerivedSources/webkit/WebKitDOMGamepadPrivate.h \
-       DerivedSources/webkit/WebKitDOMGeolocation.cpp \
-       DerivedSources/webkit/WebKitDOMGeolocationPrivate.h \
-       DerivedSources/webkit/WebKitDOMHistory.cpp \
-       DerivedSources/webkit/WebKitDOMHistoryPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLAnchorElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLAnchorElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLAppletElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLAppletElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLAreaElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLAreaElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLBaseElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLBaseElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLBaseFontElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLBaseFontElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLBodyElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLBodyElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLBRElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLBRElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLButtonElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLButtonElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLCanvasElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLCanvasElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLCollection.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLCollectionPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLDetailsElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLDetailsElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLDirectoryElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLDirectoryElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLDivElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLDivElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLDListElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLDListElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLDocument.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLDocumentPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLEmbedElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLEmbedElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLFieldSetElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLFieldSetElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLFontElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLFontElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLFormElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLFormElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLFrameElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLFrameElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLFrameSetElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLFrameSetElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLHeadElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLHeadElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLHeadingElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLHeadingElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLHRElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLHRElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLHtmlElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLHtmlElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLIFrameElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLIFrameElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLImageElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLImageElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLInputElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLInputElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLKeygenElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLKeygenElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLLabelElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLLabelElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLLegendElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLLegendElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLLIElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLLIElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLLinkElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLLinkElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLMapElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLMapElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLMarqueeElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLMarqueeElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLMediaElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLMediaElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLMenuElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLMenuElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLMetaElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLMetaElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLModElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLModElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLObjectElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLObjectElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLOListElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLOListElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLOptGroupElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLOptGroupElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLOptionElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLOptionElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLOptionsCollection.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLOptionsCollectionPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLParagraphElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLParagraphElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLParamElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLParamElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLPreElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLPreElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLPropertiesCollection.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLPropertiesCollectionPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLQuoteElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLQuoteElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLScriptElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLScriptElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLSelectElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLSelectElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLStyleElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLStyleElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableCaptionElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLTableCaptionElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableCellElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLTableCellElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableColElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLTableColElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLTableElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableRowElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLTableRowElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableSectionElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLTableSectionElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLTextAreaElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLTextAreaElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLTitleElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLTitleElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLUListElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLUListElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMLocation.cpp \
-       DerivedSources/webkit/WebKitDOMLocationPrivate.h \
-       DerivedSources/webkit/WebKitDOMMediaError.cpp \
-       DerivedSources/webkit/WebKitDOMMediaErrorPrivate.h \
-       DerivedSources/webkit/WebKitDOMMediaList.cpp \
-       DerivedSources/webkit/WebKitDOMMediaListPrivate.h \
-       DerivedSources/webkit/WebKitDOMMediaQueryList.cpp \
-       DerivedSources/webkit/WebKitDOMMediaQueryListPrivate.h \
-       DerivedSources/webkit/WebKitDOMMemoryInfo.cpp \
-       DerivedSources/webkit/WebKitDOMMemoryInfoPrivate.h \
-       DerivedSources/webkit/WebKitDOMMessagePort.cpp \
-       DerivedSources/webkit/WebKitDOMMessagePortPrivate.h \
-       DerivedSources/webkit/WebKitDOMMicroDataItemValue.cpp \
-       DerivedSources/webkit/WebKitDOMMicroDataItemValuePrivate.h \
-       DerivedSources/webkit/WebKitDOMMouseEvent.cpp \
-       DerivedSources/webkit/WebKitDOMMouseEventPrivate.h \
-       DerivedSources/webkit/WebKitDOMNamedNodeMap.cpp \
-       DerivedSources/webkit/WebKitDOMNamedNodeMapPrivate.h \
-       DerivedSources/webkit/WebKitDOMNavigator.cpp \
-       DerivedSources/webkit/WebKitDOMNavigatorPrivate.h \
-       DerivedSources/webkit/WebKitDOMNode.cpp \
-       DerivedSources/webkit/WebKitDOMNodeFilter.cpp \
-       DerivedSources/webkit/WebKitDOMNodeFilterPrivate.h \
-       DerivedSources/webkit/WebKitDOMNodeIterator.cpp \
-       DerivedSources/webkit/WebKitDOMNodeIteratorPrivate.h \
-       DerivedSources/webkit/WebKitDOMNodeList.cpp \
-       DerivedSources/webkit/WebKitDOMNodeListPrivate.h \
-       DerivedSources/webkit/WebKitDOMNodePrivate.h \
-       DerivedSources/webkit/WebKitDOMProcessingInstruction.cpp \
-       DerivedSources/webkit/WebKitDOMProcessingInstructionPrivate.h \
-       DerivedSources/webkit/WebKitDOMPropertyNodeList.cpp \
-       DerivedSources/webkit/WebKitDOMPropertyNodeListPrivate.h \
-       DerivedSources/webkit/WebKitDOMRange.cpp \
-       DerivedSources/webkit/WebKitDOMRangePrivate.h \
-       DerivedSources/webkit/WebKitDOMScreen.cpp \
-       DerivedSources/webkit/WebKitDOMScreenPrivate.h \
-       DerivedSources/webkit/WebKitDOMShadowRoot.cpp \
-       DerivedSources/webkit/WebKitDOMShadowRootPrivate.h \
-       DerivedSources/webkit/WebKitDOMStorage.cpp \
-       DerivedSources/webkit/WebKitDOMStorageInfo.cpp \
-       DerivedSources/webkit/WebKitDOMStorageInfoPrivate.h \
-       DerivedSources/webkit/WebKitDOMStoragePrivate.h \
-       DerivedSources/webkit/WebKitDOMStyleMedia.cpp \
-       DerivedSources/webkit/WebKitDOMStyleMediaPrivate.h \
-       DerivedSources/webkit/WebKitDOMStyleSheet.cpp \
-       DerivedSources/webkit/WebKitDOMStyleSheetList.cpp \
-       DerivedSources/webkit/WebKitDOMStyleSheetListPrivate.h \
-       DerivedSources/webkit/WebKitDOMStyleSheetPrivate.h \
-       DerivedSources/webkit/WebKitDOMText.cpp \
-       DerivedSources/webkit/WebKitDOMTextPrivate.h \
-       DerivedSources/webkit/WebKitDOMTimeRanges.cpp \
-       DerivedSources/webkit/WebKitDOMTimeRangesPrivate.h \
-       DerivedSources/webkit/WebKitDOMTreeWalker.cpp \
-       DerivedSources/webkit/WebKitDOMTreeWalkerPrivate.h \
-       DerivedSources/webkit/WebKitDOMUIEvent.cpp \
-       DerivedSources/webkit/WebKitDOMUIEventPrivate.h \
-       DerivedSources/webkit/WebKitDOMValidityState.cpp \
-       DerivedSources/webkit/WebKitDOMValidityStatePrivate.h \
-       DerivedSources/webkit/WebKitDOMWebKitPoint.cpp \
-       DerivedSources/webkit/WebKitDOMWebKitPointPrivate.h \
-       DerivedSources/webkit/WebKitDOMWebKitNamedFlow.cpp \
-       DerivedSources/webkit/WebKitDOMXPathExpression.cpp \
-       DerivedSources/webkit/WebKitDOMXPathExpressionPrivate.h \
-       DerivedSources/webkit/WebKitDOMXPathNSResolver.cpp \
-       DerivedSources/webkit/WebKitDOMXPathNSResolverPrivate.h \
-       DerivedSources/webkit/WebKitDOMXPathResult.cpp \
-       DerivedSources/webkit/WebKitDOMXPathResultPrivate.h
+       DerivedSources/webkitdom/WebKitDOMAttr.cpp \
+       DerivedSources/webkitdom/WebKitDOMAttrPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMBarInfo.cpp \
+       DerivedSources/webkitdom/WebKitDOMBarInfoPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMBlob.cpp \
+       DerivedSources/webkitdom/WebKitDOMBlobPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMCDATASection.cpp \
+       DerivedSources/webkitdom/WebKitDOMCDATASectionPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMCharacterData.cpp \
+       DerivedSources/webkitdom/WebKitDOMCharacterDataPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMComment.cpp \
+       DerivedSources/webkitdom/WebKitDOMCommentPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMConsole.cpp \
+       DerivedSources/webkitdom/WebKitDOMConsolePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMCSSRule.cpp \
+       DerivedSources/webkitdom/WebKitDOMCSSRuleList.cpp \
+       DerivedSources/webkitdom/WebKitDOMCSSRuleListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMCSSRulePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMCSSStyleDeclaration.cpp \
+       DerivedSources/webkitdom/WebKitDOMCSSStyleDeclarationPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMCSSStyleSheet.cpp \
+       DerivedSources/webkitdom/WebKitDOMCSSStyleSheetPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMCSSValue.cpp \
+       DerivedSources/webkitdom/WebKitDOMCSSValuePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDatabase.cpp \
+       DerivedSources/webkitdom/WebKitDOMDatabasePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDocument.cpp \
+       DerivedSources/webkitdom/WebKitDOMDocumentFragment.cpp \
+       DerivedSources/webkitdom/WebKitDOMDocumentFragmentPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDocumentPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDocumentType.cpp \
+       DerivedSources/webkitdom/WebKitDOMDocumentTypePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMApplicationCache.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMApplicationCachePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMImplementation.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMImplementationPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMMimeTypeArray.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMMimeTypeArrayPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMMimeType.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMMimeTypePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMNamedFlowCollection.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMPluginArray.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMPluginArrayPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMPlugin.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMPluginPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMSecurityPolicy.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMSecurityPolicyPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMSelection.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMSelectionPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMStringList.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMStringListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMStringMap.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMStringMapPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMSettableTokenList.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMSettableTokenListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMTokenList.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMTokenListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMDOMWindow.cpp \
+       DerivedSources/webkitdom/WebKitDOMDOMWindowPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMEntityReference.cpp \
+       DerivedSources/webkitdom/WebKitDOMEntityReferencePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMEvent.cpp \
+       DerivedSources/webkitdom/WebKitDOMEventPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMEventTargetPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMFile.cpp \
+       DerivedSources/webkitdom/WebKitDOMFileList.cpp \
+       DerivedSources/webkitdom/WebKitDOMFileListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMFilePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMGamepad.cpp \
+       DerivedSources/webkitdom/WebKitDOMGamepadList.cpp \
+       DerivedSources/webkitdom/WebKitDOMGamepadListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMGamepadPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMGeolocation.cpp \
+       DerivedSources/webkitdom/WebKitDOMGeolocationPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHistory.cpp \
+       DerivedSources/webkitdom/WebKitDOMHistoryPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLAnchorElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLAnchorElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLAppletElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLAppletElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLAreaElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLAreaElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLBaseElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLBaseElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLBaseFontElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLBaseFontElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLBodyElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLBodyElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLBRElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLBRElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLButtonElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLButtonElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLCanvasElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLCanvasElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLCollection.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLCollectionPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDetailsElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLDetailsElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDirectoryElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLDirectoryElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDivElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLDivElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDListElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLDListElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDocument.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLDocumentPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLEmbedElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLEmbedElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFieldSetElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLFieldSetElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFontElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLFontElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFormElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLFormElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFrameElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLFrameElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFrameSetElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLFrameSetElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLHeadElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLHeadElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLHeadingElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLHeadingElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLHRElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLHRElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLHtmlElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLHtmlElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLIFrameElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLIFrameElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLImageElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLImageElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLInputElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLInputElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLKeygenElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLKeygenElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLLabelElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLLabelElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLLegendElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLLegendElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLLIElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLLIElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLLinkElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLLinkElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMapElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLMapElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMarqueeElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLMarqueeElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMediaElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLMediaElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMenuElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLMenuElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMetaElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLMetaElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLModElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLModElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLObjectElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLObjectElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLOListElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLOListElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLOptGroupElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLOptGroupElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLOptionElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLOptionElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLOptionsCollection.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLOptionsCollectionPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLParagraphElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLParagraphElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLParamElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLParamElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLPreElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLPreElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLPropertiesCollection.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLPropertiesCollectionPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLQuoteElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLQuoteElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLScriptElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLScriptElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLSelectElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLSelectElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLStyleElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLStyleElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableCaptionElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableCaptionElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableCellElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableCellElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableColElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableColElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableRowElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableRowElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableSectionElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableSectionElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTextAreaElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLTextAreaElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTitleElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLTitleElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLUListElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLUListElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMLocation.cpp \
+       DerivedSources/webkitdom/WebKitDOMLocationPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMMediaError.cpp \
+       DerivedSources/webkitdom/WebKitDOMMediaErrorPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMMediaList.cpp \
+       DerivedSources/webkitdom/WebKitDOMMediaListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMMediaQueryList.cpp \
+       DerivedSources/webkitdom/WebKitDOMMediaQueryListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMMemoryInfo.cpp \
+       DerivedSources/webkitdom/WebKitDOMMemoryInfoPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMMessagePort.cpp \
+       DerivedSources/webkitdom/WebKitDOMMessagePortPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMMicroDataItemValue.cpp \
+       DerivedSources/webkitdom/WebKitDOMMicroDataItemValuePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMMouseEvent.cpp \
+       DerivedSources/webkitdom/WebKitDOMMouseEventPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMNamedNodeMap.cpp \
+       DerivedSources/webkitdom/WebKitDOMNamedNodeMapPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMNavigator.cpp \
+       DerivedSources/webkitdom/WebKitDOMNavigatorPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMNode.cpp \
+       DerivedSources/webkitdom/WebKitDOMNodeFilter.cpp \
+       DerivedSources/webkitdom/WebKitDOMNodeFilterPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMNodeIterator.cpp \
+       DerivedSources/webkitdom/WebKitDOMNodeIteratorPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMNodeList.cpp \
+       DerivedSources/webkitdom/WebKitDOMNodeListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMNodePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMProcessingInstruction.cpp \
+       DerivedSources/webkitdom/WebKitDOMProcessingInstructionPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMPropertyNodeList.cpp \
+       DerivedSources/webkitdom/WebKitDOMPropertyNodeListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMRange.cpp \
+       DerivedSources/webkitdom/WebKitDOMRangePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMScreen.cpp \
+       DerivedSources/webkitdom/WebKitDOMScreenPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMShadowRoot.cpp \
+       DerivedSources/webkitdom/WebKitDOMShadowRootPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMStorage.cpp \
+       DerivedSources/webkitdom/WebKitDOMStorageInfo.cpp \
+       DerivedSources/webkitdom/WebKitDOMStorageInfoPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMStoragePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMStyleMedia.cpp \
+       DerivedSources/webkitdom/WebKitDOMStyleMediaPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMStyleSheet.cpp \
+       DerivedSources/webkitdom/WebKitDOMStyleSheetList.cpp \
+       DerivedSources/webkitdom/WebKitDOMStyleSheetListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMStyleSheetPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMText.cpp \
+       DerivedSources/webkitdom/WebKitDOMTextPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMTimeRanges.cpp \
+       DerivedSources/webkitdom/WebKitDOMTimeRangesPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMTreeWalker.cpp \
+       DerivedSources/webkitdom/WebKitDOMTreeWalkerPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMUIEvent.cpp \
+       DerivedSources/webkitdom/WebKitDOMUIEventPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMValidityState.cpp \
+       DerivedSources/webkitdom/WebKitDOMValidityStatePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMWebKitPoint.cpp \
+       DerivedSources/webkitdom/WebKitDOMWebKitPointPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMWebKitNamedFlow.cpp \
+       DerivedSources/webkitdom/WebKitDOMXPathExpression.cpp \
+       DerivedSources/webkitdom/WebKitDOMXPathExpressionPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMXPathNSResolver.cpp \
+       DerivedSources/webkitdom/WebKitDOMXPathNSResolverPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMXPathResult.cpp \
+       DerivedSources/webkitdom/WebKitDOMXPathResultPrivate.h
 
-webkitgtk_built_h_api += \
-       DerivedSources/webkit/WebKitDOMCSSRule.h \
-       DerivedSources/webkit/WebKitDOMCSSRuleList.h \
-       DerivedSources/webkit/WebKitDOMCSSStyleDeclaration.h \
-       DerivedSources/webkit/WebKitDOMCSSStyleSheet.h \
-       DerivedSources/webkit/WebKitDOMCSSValue.h \
-       DerivedSources/webkit/WebKitDOMMediaList.h \
-       DerivedSources/webkit/WebKitDOMMediaQueryList.h \
-       DerivedSources/webkit/WebKitDOMStyleMedia.h \
-       DerivedSources/webkit/WebKitDOMStyleSheet.h \
-       DerivedSources/webkit/WebKitDOMStyleSheetList.h \
-       DerivedSources/webkit/WebKitDOMAttr.h \
-       DerivedSources/webkit/WebKitDOMCDATASection.h \
-       DerivedSources/webkit/WebKitDOMCharacterData.h \
-       DerivedSources/webkit/WebKitDOMComment.h \
-       DerivedSources/webkit/WebKitDOMDocument.h \
-       DerivedSources/webkit/WebKitDOMDocumentFragment.h \
-       DerivedSources/webkit/WebKitDOMDocumentType.h \
-       DerivedSources/webkit/WebKitDOMDOMImplementation.h \
-       DerivedSources/webkit/WebKitDOMDOMNamedFlowCollection.h \
-       DerivedSources/webkit/WebKitDOMDOMSettableTokenList.h \
-       DerivedSources/webkit/WebKitDOMDOMSecurityPolicy.h \
-       DerivedSources/webkit/WebKitDOMDOMStringList.h \
-       DerivedSources/webkit/WebKitDOMDOMStringMap.h \
-       DerivedSources/webkit/WebKitDOMDOMTokenList.h \
-       DerivedSources/webkit/WebKitDOMElement.h \
-       DerivedSources/webkit/WebKitDOMEntityReference.h \
-       DerivedSources/webkit/WebKitDOMEvent.h \
-       DerivedSources/webkit/WebKitDOMMessagePort.h \
-       DerivedSources/webkit/WebKitDOMMouseEvent.h \
-       DerivedSources/webkit/WebKitDOMNamedNodeMap.h \
-       DerivedSources/webkit/WebKitDOMNode.h \
-       DerivedSources/webkit/WebKitDOMNodeFilter.h \
-       DerivedSources/webkit/WebKitDOMNodeIterator.h \
-       DerivedSources/webkit/WebKitDOMNodeList.h \
-       DerivedSources/webkit/WebKitDOMProcessingInstruction.h \
-       DerivedSources/webkit/WebKitDOMRange.h \
-       DerivedSources/webkit/WebKitDOMText.h \
-       DerivedSources/webkit/WebKitDOMTreeWalker.h \
-       DerivedSources/webkit/WebKitDOMUIEvent.h \
-       DerivedSources/webkit/WebKitDOMBlob.h \
-       DerivedSources/webkit/WebKitDOMFile.h \
-       DerivedSources/webkit/WebKitDOMFileList.h \
-       DerivedSources/webkit/WebKitDOMGamepad.h \
-       DerivedSources/webkit/WebKitDOMGamepadList.h \
-       DerivedSources/webkit/WebKitDOMGeolocation.h \
-       DerivedSources/webkit/WebKitDOMHTMLAnchorElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLAppletElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLAreaElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLBaseElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLBaseFontElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLBodyElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLBRElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLButtonElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLCanvasElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLCollection.h \
-       DerivedSources/webkit/WebKitDOMHTMLDirectoryElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLDivElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLDListElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLDocument.h \
-       DerivedSources/webkit/WebKitDOMHTMLDetailsElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLEmbedElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLFieldSetElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLFontElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLFormElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLFrameElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLFrameSetElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLHeadElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLHeadingElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLHRElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLHtmlElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLIFrameElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLImageElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLInputElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLKeygenElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLLabelElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLLegendElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLLIElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLLinkElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLMapElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLMarqueeElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLMediaElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLMenuElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLMetaElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLModElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLObjectElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLOListElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLOptGroupElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLOptionElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLOptionsCollection.h \
-       DerivedSources/webkit/WebKitDOMHTMLParagraphElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLParamElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLPreElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLPropertiesCollection.h \
-       DerivedSources/webkit/WebKitDOMHTMLQuoteElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLScriptElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLSelectElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLStyleElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableCaptionElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableColElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableSectionElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableCellElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLTextAreaElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLTitleElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLTableRowElement.h \
-       DerivedSources/webkit/WebKitDOMHTMLUListElement.h \
-       DerivedSources/webkit/WebKitDOMMediaError.h \
-       DerivedSources/webkit/WebKitDOMTimeRanges.h \
-       DerivedSources/webkit/WebKitDOMValidityState.h \
-       DerivedSources/webkit/WebKitDOMDOMApplicationCache.h \
-       DerivedSources/webkit/WebKitDOMBarInfo.h \
-       DerivedSources/webkit/WebKitDOMConsole.h \
-       DerivedSources/webkit/WebKitDOMCustom.h \
-       DerivedSources/webkit/WebKitDOMDOMWindow.h \
-       DerivedSources/webkit/WebKitDOMDOMSelection.h \
-       DerivedSources/webkit/WebKitDOMEventTarget.h \
-       DerivedSources/webkit/WebKitDOMHistory.h \
-       DerivedSources/webkit/WebKitDOMLocation.h \
-       DerivedSources/webkit/WebKitDOMMemoryInfo.h \
-       DerivedSources/webkit/WebKitDOMMicroDataItemValue.h \
-       DerivedSources/webkit/WebKitDOMObject.h \
-       DerivedSources/webkit/WebKitDOMNavigator.h \
-       DerivedSources/webkit/WebKitDOMPropertyNodeList.h \
-       DerivedSources/webkit/WebKitDOMScreen.h \
-       DerivedSources/webkit/WebKitDOMShadowRoot.h \
-       DerivedSources/webkit/WebKitDOMWebKitPoint.h \
-       DerivedSources/webkit/WebKitDOMWebKitNamedFlow.h \
-       DerivedSources/webkit/WebKitDOMDOMMimeType.h \
-       DerivedSources/webkit/WebKitDOMDOMMimeTypeArray.h \
-       DerivedSources/webkit/WebKitDOMDOMPlugin.h \
-       DerivedSources/webkit/WebKitDOMDOMPluginArray.h \
-       DerivedSources/webkit/WebKitDOMDatabase.h \
-       DerivedSources/webkit/WebKitDOMStorage.h \
-       DerivedSources/webkit/WebKitDOMStorageInfo.h \
-       DerivedSources/webkit/WebKitDOMXPathExpression.h \
-       DerivedSources/webkit/WebKitDOMXPathNSResolver.h \
-       DerivedSources/webkit/WebKitDOMXPathResult.h \
-       DerivedSources/webkit/webkitdom.h \
-       DerivedSources/webkit/webkitdomdefines.h
+webkitgtk_gdom_built_h_api += \
+       DerivedSources/webkitdom/WebKitDOMCSSRule.h \
+       DerivedSources/webkitdom/WebKitDOMCSSRuleList.h \
+       DerivedSources/webkitdom/WebKitDOMCSSStyleDeclaration.h \
+       DerivedSources/webkitdom/WebKitDOMCSSStyleSheet.h \
+       DerivedSources/webkitdom/WebKitDOMCSSValue.h \
+       DerivedSources/webkitdom/WebKitDOMMediaList.h \
+       DerivedSources/webkitdom/WebKitDOMMediaQueryList.h \
+       DerivedSources/webkitdom/WebKitDOMStyleMedia.h \
+       DerivedSources/webkitdom/WebKitDOMStyleSheet.h \
+       DerivedSources/webkitdom/WebKitDOMStyleSheetList.h \
+       DerivedSources/webkitdom/WebKitDOMAttr.h \
+       DerivedSources/webkitdom/WebKitDOMCDATASection.h \
+       DerivedSources/webkitdom/WebKitDOMCharacterData.h \
+       DerivedSources/webkitdom/WebKitDOMComment.h \
+       DerivedSources/webkitdom/WebKitDOMDocument.h \
+       DerivedSources/webkitdom/WebKitDOMDocumentFragment.h \
+       DerivedSources/webkitdom/WebKitDOMDocumentType.h \
+       DerivedSources/webkitdom/WebKitDOMDOMImplementation.h \
+       DerivedSources/webkitdom/WebKitDOMDOMNamedFlowCollection.h \
+       DerivedSources/webkitdom/WebKitDOMDOMSettableTokenList.h \
+       DerivedSources/webkitdom/WebKitDOMDOMSecurityPolicy.h \
+       DerivedSources/webkitdom/WebKitDOMDOMStringList.h \
+       DerivedSources/webkitdom/WebKitDOMDOMStringMap.h \
+       DerivedSources/webkitdom/WebKitDOMDOMTokenList.h \
+       DerivedSources/webkitdom/WebKitDOMElement.h \
+       DerivedSources/webkitdom/WebKitDOMEntityReference.h \
+       DerivedSources/webkitdom/WebKitDOMEvent.h \
+       DerivedSources/webkitdom/WebKitDOMMessagePort.h \
+       DerivedSources/webkitdom/WebKitDOMMouseEvent.h \
+       DerivedSources/webkitdom/WebKitDOMNamedNodeMap.h \
+       DerivedSources/webkitdom/WebKitDOMNode.h \
+       DerivedSources/webkitdom/WebKitDOMNodeFilter.h \
+       DerivedSources/webkitdom/WebKitDOMNodeIterator.h \
+       DerivedSources/webkitdom/WebKitDOMNodeList.h \
+       DerivedSources/webkitdom/WebKitDOMProcessingInstruction.h \
+       DerivedSources/webkitdom/WebKitDOMRange.h \
+       DerivedSources/webkitdom/WebKitDOMText.h \
+       DerivedSources/webkitdom/WebKitDOMTreeWalker.h \
+       DerivedSources/webkitdom/WebKitDOMUIEvent.h \
+       DerivedSources/webkitdom/WebKitDOMBlob.h \
+       DerivedSources/webkitdom/WebKitDOMFile.h \
+       DerivedSources/webkitdom/WebKitDOMFileList.h \
+       DerivedSources/webkitdom/WebKitDOMGamepad.h \
+       DerivedSources/webkitdom/WebKitDOMGamepadList.h \
+       DerivedSources/webkitdom/WebKitDOMGeolocation.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLAnchorElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLAppletElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLAreaElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLBaseElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLBaseFontElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLBodyElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLBRElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLButtonElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLCanvasElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLCollection.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDirectoryElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDivElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDListElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDocument.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLDetailsElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLEmbedElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFieldSetElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFontElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFormElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFrameElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLFrameSetElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLHeadElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLHeadingElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLHRElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLHtmlElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLIFrameElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLImageElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLInputElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLKeygenElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLLabelElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLLegendElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLLIElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLLinkElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMapElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMarqueeElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMediaElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMenuElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLMetaElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLModElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLObjectElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLOListElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLOptGroupElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLOptionElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLOptionsCollection.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLParagraphElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLParamElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLPreElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLPropertiesCollection.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLQuoteElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLScriptElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLSelectElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLStyleElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableCaptionElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableColElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableSectionElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableCellElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTextAreaElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTitleElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLTableRowElement.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLUListElement.h \
+       DerivedSources/webkitdom/WebKitDOMMediaError.h \
+       DerivedSources/webkitdom/WebKitDOMTimeRanges.h \
+       DerivedSources/webkitdom/WebKitDOMValidityState.h \
+       DerivedSources/webkitdom/WebKitDOMDOMApplicationCache.h \
+       DerivedSources/webkitdom/WebKitDOMBarInfo.h \
+       DerivedSources/webkitdom/WebKitDOMConsole.h \
+       DerivedSources/webkitdom/WebKitDOMCustom.h \
+       DerivedSources/webkitdom/WebKitDOMDOMWindow.h \
+       DerivedSources/webkitdom/WebKitDOMDOMSelection.h \
+       DerivedSources/webkitdom/WebKitDOMEventTarget.h \
+       DerivedSources/webkitdom/WebKitDOMHistory.h \
+       DerivedSources/webkitdom/WebKitDOMLocation.h \
+       DerivedSources/webkitdom/WebKitDOMMemoryInfo.h \
+       DerivedSources/webkitdom/WebKitDOMMicroDataItemValue.h \
+       DerivedSources/webkitdom/WebKitDOMObject.h \
+       DerivedSources/webkitdom/WebKitDOMNavigator.h \
+       DerivedSources/webkitdom/WebKitDOMPropertyNodeList.h \
+       DerivedSources/webkitdom/WebKitDOMScreen.h \
+       DerivedSources/webkitdom/WebKitDOMShadowRoot.h \
+       DerivedSources/webkitdom/WebKitDOMWebKitPoint.h \
+       DerivedSources/webkitdom/WebKitDOMWebKitNamedFlow.h \
+       DerivedSources/webkitdom/WebKitDOMDOMMimeType.h \
+       DerivedSources/webkitdom/WebKitDOMDOMMimeTypeArray.h \
+       DerivedSources/webkitdom/WebKitDOMDOMPlugin.h \
+       DerivedSources/webkitdom/WebKitDOMDOMPluginArray.h \
+       DerivedSources/webkitdom/WebKitDOMDatabase.h \
+       DerivedSources/webkitdom/WebKitDOMStorage.h \
+       DerivedSources/webkitdom/WebKitDOMStorageInfo.h \
+       DerivedSources/webkitdom/WebKitDOMXPathExpression.h \
+       DerivedSources/webkitdom/WebKitDOMXPathNSResolver.h \
+       DerivedSources/webkitdom/WebKitDOMXPathResult.h \
+       DerivedSources/webkitdom/webkitdom.h \
+       DerivedSources/webkitdom/webkitdomdefines.h
 
 if ENABLE_VIDEO
-webkitgtk_built_h_api += \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMHTMLAudioElement.h \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMHTMLVideoElement.h
+webkitgtk_gdom_built_h_api += \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMHTMLAudioElement.h \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMHTMLVideoElement.h
 webkitgtk_gdom_built_sources += \
-       DerivedSources/webkit/WebKitDOMHTMLAudioElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLAudioElementPrivate.h \
-       DerivedSources/webkit/WebKitDOMHTMLVideoElement.cpp \
-       DerivedSources/webkit/WebKitDOMHTMLVideoElementPrivate.h
+       DerivedSources/webkitdom/WebKitDOMHTMLAudioElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLAudioElementPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMHTMLVideoElement.cpp \
+       DerivedSources/webkitdom/WebKitDOMHTMLVideoElementPrivate.h
 
 # Video Track feature currently depends on HTML Video and is considered unstable.
 if ENABLE_UNSTABLE_FEATURES
-webkitgtk_built_h_api += \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMTextTrack.h \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMTextTrackList.h \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMTextTrackCue.h \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMTextTrackCueList.h \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMTrackEvent.h
+webkitgtk_gdom_built_h_api += \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMTextTrack.h \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMTextTrackList.h \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMTextTrackCue.h \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMTextTrackCueList.h \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMTrackEvent.h
 webkitgtk_gdom_built_sources += \
-       DerivedSources/webkit/WebKitDOMTextTrack.cpp \
-       DerivedSources/webkit/WebKitDOMTextTrackPrivate.h \
-       DerivedSources/webkit/WebKitDOMTextTrackList.cpp \
-       DerivedSources/webkit/WebKitDOMTextTrackListPrivate.h \
-       DerivedSources/webkit/WebKitDOMTextTrackCue.cpp \
-       DerivedSources/webkit/WebKitDOMTextTrackCuePrivate.h \
-       DerivedSources/webkit/WebKitDOMTextTrackCueList.cpp \
-       DerivedSources/webkit/WebKitDOMTextTrackCueListPrivate.h \
-       DerivedSources/webkit/WebKitDOMTrackEvent.cpp \
-       DerivedSources/webkit/WebKitDOMTrackEventPrivate.h
+       DerivedSources/webkitdom/WebKitDOMTextTrack.cpp \
+       DerivedSources/webkitdom/WebKitDOMTextTrackPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMTextTrackList.cpp \
+       DerivedSources/webkitdom/WebKitDOMTextTrackListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMTextTrackCue.cpp \
+       DerivedSources/webkitdom/WebKitDOMTextTrackCuePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMTextTrackCueList.cpp \
+       DerivedSources/webkitdom/WebKitDOMTextTrackCueListPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMTrackEvent.cpp \
+       DerivedSources/webkitdom/WebKitDOMTrackEventPrivate.h
 endif
 endif
 
 # Web Timing feature is currently considered unstable.
 if ENABLE_UNSTABLE_FEATURES
-webkitgtk_built_h_api += \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMPerformance.h \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMPerformanceNavigation.h \
-       $(top_builddir)/DerivedSources/webkit/WebKitDOMPerformanceTiming.h
+webkitgtk_gdom_built_h_api += \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMPerformance.h \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMPerformanceNavigation.h \
+       $(top_builddir)/DerivedSources/webkitdom/WebKitDOMPerformanceTiming.h
 webkitgtk_gdom_built_sources += \
-       DerivedSources/webkit/WebKitDOMPerformance.cpp \
-       DerivedSources/webkit/WebKitDOMPerformancePrivate.h \
-       DerivedSources/webkit/WebKitDOMPerformanceNavigation.cpp \
-       DerivedSources/webkit/WebKitDOMPerformanceNavigationPrivate.h \
-       DerivedSources/webkit/WebKitDOMPerformanceTiming.cpp \
-       DerivedSources/webkit/WebKitDOMPerformanceTimingPrivate.h
+       DerivedSources/webkitdom/WebKitDOMPerformance.cpp \
+       DerivedSources/webkitdom/WebKitDOMPerformancePrivate.h \
+       DerivedSources/webkitdom/WebKitDOMPerformanceNavigation.cpp \
+       DerivedSources/webkitdom/WebKitDOMPerformanceNavigationPrivate.h \
+       DerivedSources/webkitdom/WebKitDOMPerformanceTiming.cpp \
+       DerivedSources/webkitdom/WebKitDOMPerformanceTimingPrivate.h
 endif
 
+BUILT_SOURCES += \
+       $(webkitgtk_gdom_built_h_api) \
+       $(webkitgtk_gdom_built_sources)
+
 gdom_class_list := $(subst WebKitDOM,, $(filter-out %Private, $(basename $(notdir $(webkitgtk_gdom_built_sources)))))
 gdom_class_list += Custom EventTarget Object
-DerivedSources/webkit/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am
+DerivedSources/webkitdom/webkitdom.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am
        $(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $< gdom > $@
 
-DerivedSources/webkit/webkitdomdefines.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am
+DerivedSources/webkitdom/webkitdomdefines.h: $(WebCore)/bindings/scripts/gobject-generate-headers.pl $(WebCore)/bindings/gobject/GNUmakefile.am
        $(AM_V_GEN)echo $(gdom_class_list) | $(PERL) $< defines > $@
 
 # Because WebCore/bindings/gobject/WebKitDOMObject.h is static source but is also a distributed header
 # required by other distributed headers (both static and auto-generated), need to move this to the
-# DerivedSources/webkit directory.  The reason is that we want all header files distributed in the
-# include/webkit-x.y/webkit directory, but do not want to name the WebCore/bindings/gobject directory 
-# "webkit", as that's a bit presumptuous for a GTK binding.
-$(top_builddir)/DerivedSources/webkit/WebKitDOMObject.h: $(WebCore)/bindings/gobject/WebKitDOMObject.h
+# DerivedSources/webkitdom directory.  The reason is that we want all header files distributed in the
+# include/webkit-x.y/webkitdom directory, but do not want to name the WebCore/bindings/gobject directory
+# "webkitdom", as that's a bit presumptuous for a GTK binding.
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMObject.h: $(WebCore)/bindings/gobject/WebKitDOMObject.h
        $(AM_V_GEN)cp -f $< $@
 
-$(top_builddir)/DerivedSources/webkit/WebKitDOMEventTarget.h: $(WebCore)/bindings/gobject/WebKitDOMEventTarget.h
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTarget.h: $(WebCore)/bindings/gobject/WebKitDOMEventTarget.h
        $(AM_V_GEN)cp -f $< $@
 
-$(top_builddir)/DerivedSources/webkit/WebKitDOMEventTargetPrivate.h: $(WebCore)/bindings/gobject/WebKitDOMEventTargetPrivate.h
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMEventTargetPrivate.h: $(WebCore)/bindings/gobject/WebKitDOMEventTargetPrivate.h
        $(AM_V_GEN)cp -f $< $@
 
-$(top_builddir)/DerivedSources/webkit/WebKitDOMCustom.h: $(WebCore)/bindings/gobject/WebKitDOMCustom.h
+$(top_builddir)/DerivedSources/webkitdom/WebKitDOMCustom.h: $(WebCore)/bindings/gobject/WebKitDOMCustom.h
        $(AM_V_GEN)cp -f $< $@
 
 # Filter out SVG and IndexedDB for now
 gdom_feature_defines := $(filter-out ENABLE_INDEXED_DATABASE=1, $(filter-out ENABLE_SVG%, $(feature_defines))) ENABLE_INDEXED_DATABASE=0
-DerivedSources/webkit/WebKitDOM%.cpp DerivedSources/webkit/WebKitDOM%.h DerivedSources/webkit/WebKitDOM%Private.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm $(WebCore)/bindings/gobject/GNUmakefile.am $(supplemental_dependency_file)
-       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKIT)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<
+DerivedSources/webkitdom/WebKitDOM%.cpp DerivedSources/webkitdom/WebKitDOM%.h DerivedSources/webkitdom/WebKitDOM%Private.h: %.idl $(SCRIPTS_FOR_GENERATE_BINDINGS) $(WebCore)/bindings/scripts/CodeGeneratorGObject.pm $(WebCore)/bindings/gobject/GNUmakefile.am $(supplemental_dependency_file)
+       $(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $(WebCore)/bindings/scripts/generate-bindings.pl --include $(WebCore)/dom --include $(WebCore)/html --include $(WebCore)/css --include $(WebCore)/page --include $(WebCore)/xml --include $(WebCore)/svg --outputDir "$(GENSOURCES_WEBKITDOM)" --defines "LANGUAGE_GOBJECT=1 $(gdom_feature_defines)" --generator GObject --supplementalDependencyFile $(supplemental_dependency_file) $<
+
+libwebkitdomincludedir = $(libwebkitgtkincludedir)/webkitdom
+libwebkitdominclude_HEADERS = \
+       $(webkitgtk_gdom_built_h_api)
 
 noinst_LTLIBRARIES += \
        libWebCoreDOM.la
@@ -526,7 +534,7 @@ libWebCoreDOM_la_CPPFLAGS = \
        -DBUILDING_WEBKIT \
        -I$(WebCore)/bindings \
        -I$(WebCore)/bindings/gobject \
-       -I$(GENSOURCES_WEBKIT) \
+       -I$(GENSOURCES_WEBKITDOM) \
        $(global_cppflags) \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
index c9e4902..ac1f96a 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef WebKitDOMBinding_h
 #define WebKitDOMBinding_h
 
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/webkitdomdefines.h>
 
 #define WEBKIT_PARAM_READABLE ((GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
 #define WEBKIT_PARAM_READWRITE ((GParamFlags)(G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB))
index b8d5a91..65bc507 100644 (file)
@@ -20,7 +20,7 @@
 #define WebKitDOMCustom_h
 
 #include <glib.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 1dc0b8d..6f2d6fe 100644 (file)
@@ -20,7 +20,7 @@
 #define WebKitDOMEventTarget_h
 
 #include <glib-object.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index e65b5a7..ac29471 100644 (file)
@@ -21,7 +21,7 @@
 #define WebKitDOMEventTargetPrivate_h
 
 #include "EventTarget.h"
-#include <webkit/WebKitDOMEventTarget.h>
+#include <webkitdom/WebKitDOMEventTarget.h>
 
 namespace WebKit {
 WebCore::EventTarget* core(WebKitDOMEventTarget* request);
index f7362c9..3556b79 100644 (file)
@@ -26,7 +26,7 @@
 #define WebKitDOMObject_h
 
 #include <glib-object.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index c1ff01e..3d84115 100644 (file)
@@ -1358,7 +1358,7 @@ sub Generate {
     $implIncludes{"JSMainThreadExecState.h"} = 1;
     $implIncludes{"ExceptionCode.h"} = 1;
 
-    $hdrIncludes{"webkit/${parentClassName}.h"} = 1;
+    $hdrIncludes{"webkitdom/${parentClassName}.h"} = 1;
 
     $object->GenerateHeader($interfaceName, $parentClassName);
     $object->GenerateCFile($interfaceName, $parentClassName, $parentGObjType, $interface);
@@ -1389,7 +1389,7 @@ sub WriteData {
 #define $guard
 
 #include "${interfaceName}.h"
-#include <webkit/${className}.h>
+#include <webkitdom/${className}.h>
 EOF
 
     print PRIVHEADER $text;
@@ -1431,7 +1431,7 @@ EOF
     print HEADER @hPrefixGuard;
     print HEADER "#include <glib-object.h>\n";
     print HEADER map { "#include <$_>\n" } sort keys(%hdrIncludes);
-    print HEADER "#include <webkit/webkitdomdefines.h>\n\n";
+    print HEADER "#include <webkitdom/webkitdomdefines.h>\n\n";
     print HEADER @hBodyPre;
     print HEADER @hBody;
     print HEADER @hPrefixGuardEnd;
index f7a7187..6955955 100644 (file)
@@ -85,7 +85,7 @@ if ($outType eq "defines") {
     }
 } elsif ($outType eq "gdom") {
     foreach my $class (@classes) {
-        print "#include <webkit/WebKitDOM${class}.h>\n";
+        print "#include <webkitdom/WebKitDOM${class}.h>\n";
     }
 }
 
index 7401f56..9d96bc5 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMFloat64Array_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMArrayBufferView.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMArrayBufferView.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index f4d9f81..fc8ea85 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMFloat64ArrayPrivate_h
 
 #include "Float64Array.h"
-#include <webkit/WebKitDOMFloat64Array.h>
+#include <webkitdom/WebKitDOMFloat64Array.h>
 
 namespace WebKit {
 WebKitDOMFloat64Array* wrapFloat64Array(WebCore::Float64Array*);
index c519904..c8fba1a 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestActiveDOMObject_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index b493495..984ee76 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestActiveDOMObjectPrivate_h
 
 #include "TestActiveDOMObject.h"
-#include <webkit/WebKitDOMTestActiveDOMObject.h>
+#include <webkitdom/WebKitDOMTestActiveDOMObject.h>
 
 namespace WebKit {
 WebKitDOMTestActiveDOMObject* wrapTestActiveDOMObject(WebCore::TestActiveDOMObject*);
index 677ba39..9742511 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestCallback_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 37b2de6..41e3836 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestCallbackPrivate_h
 
 #include "TestCallback.h"
-#include <webkit/WebKitDOMTestCallback.h>
+#include <webkitdom/WebKitDOMTestCallback.h>
 #if ENABLE(SQL_DATABASE)
 
 namespace WebKit {
index f5aeb9c..b14b9ea 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestCustomNamedGetter_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 787c19d..1dc538b 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestCustomNamedGetterPrivate_h
 
 #include "TestCustomNamedGetter.h"
-#include <webkit/WebKitDOMTestCustomNamedGetter.h>
+#include <webkitdom/WebKitDOMTestCustomNamedGetter.h>
 
 namespace WebKit {
 WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter*);
index a47e551..81b897c 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestEventConstructor_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 9ccf32d..90f410f 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestEventConstructorPrivate_h
 
 #include "TestEventConstructor.h"
-#include <webkit/WebKitDOMTestEventConstructor.h>
+#include <webkitdom/WebKitDOMTestEventConstructor.h>
 
 namespace WebKit {
 WebKitDOMTestEventConstructor* wrapTestEventConstructor(WebCore::TestEventConstructor*);
index f97bf4e..c7b1e50 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestEventTarget_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 8dd27fa..ace9c32 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestEventTargetPrivate_h
 
 #include "TestEventTarget.h"
-#include <webkit/WebKitDOMTestEventTarget.h>
+#include <webkitdom/WebKitDOMTestEventTarget.h>
 
 namespace WebKit {
 WebKitDOMTestEventTarget* wrapTestEventTarget(WebCore::TestEventTarget*);
index 80c2ce7..f88fc4a 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestException_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 82cbd05..8060a8e 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestExceptionPrivate_h
 
 #include "TestException.h"
-#include <webkit/WebKitDOMTestException.h>
+#include <webkitdom/WebKitDOMTestException.h>
 
 namespace WebKit {
 WebKitDOMTestException* wrapTestException(WebCore::TestException*);
index 9bb5c47..275d8bc 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestInterface_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 87bf958..b616514 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestInterfacePrivate_h
 
 #include "TestInterface.h"
-#include <webkit/WebKitDOMTestInterface.h>
+#include <webkitdom/WebKitDOMTestInterface.h>
 #if ENABLE(Condition1) || ENABLE(Condition2)
 
 namespace WebKit {
index 74e7062..01bfb02 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestMediaQueryListListener_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index dca730c..36ed999 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestMediaQueryListListenerPrivate_h
 
 #include "TestMediaQueryListListener.h"
-#include <webkit/WebKitDOMTestMediaQueryListListener.h>
+#include <webkitdom/WebKitDOMTestMediaQueryListListener.h>
 
 namespace WebKit {
 WebKitDOMTestMediaQueryListListener* wrapTestMediaQueryListListener(WebCore::TestMediaQueryListListener*);
index 1e6b38e..fd99660 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestNamedConstructor_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index d39a3c2..ea17c70 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestNamedConstructorPrivate_h
 
 #include "TestNamedConstructor.h"
-#include <webkit/WebKitDOMTestNamedConstructor.h>
+#include <webkitdom/WebKitDOMTestNamedConstructor.h>
 
 namespace WebKit {
 WebKitDOMTestNamedConstructor* wrapTestNamedConstructor(WebCore::TestNamedConstructor*);
index 14697c6..8564eba 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestNode_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMNode.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMNode.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 3914766..d01e8c8 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestNodePrivate_h
 
 #include "TestNode.h"
-#include <webkit/WebKitDOMTestNode.h>
+#include <webkitdom/WebKitDOMTestNode.h>
 
 namespace WebKit {
 WebKitDOMTestNode* wrapTestNode(WebCore::TestNode*);
index bee55b6..ac8d6c0 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestObj_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 8b895f0..d338a2b 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestObjPrivate_h
 
 #include "TestObj.h"
-#include <webkit/WebKitDOMTestObj.h>
+#include <webkitdom/WebKitDOMTestObj.h>
 
 namespace WebKit {
 WebKitDOMTestObj* wrapTestObj(WebCore::TestObj*);
index 44e3074..55a7048 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestOverloadedConstructors_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index ffbc1b1..69a974e 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestOverloadedConstructorsPrivate_h
 
 #include "TestOverloadedConstructors.h"
-#include <webkit/WebKitDOMTestOverloadedConstructors.h>
+#include <webkitdom/WebKitDOMTestOverloadedConstructors.h>
 
 namespace WebKit {
 WebKitDOMTestOverloadedConstructors* wrapTestOverloadedConstructors(WebCore::TestOverloadedConstructors*);
index 6481b76..005bf3d 100644 (file)
@@ -22,8 +22,8 @@
 #define WebKitDOMTestSerializedScriptValueInterface_h
 
 #include <glib-object.h>
-#include <webkit/WebKitDOMObject.h>
-#include <webkit/webkitdomdefines.h>
+#include <webkitdom/WebKitDOMObject.h>
+#include <webkitdom/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 
index 9c8d85f..672e4d6 100644 (file)
@@ -22,7 +22,7 @@
 #define WebKitDOMTestSerializedScriptValueInterfacePrivate_h
 
 #include "TestSerializedScriptValueInterface.h"
-#include <webkit/WebKitDOMTestSerializedScriptValueInterface.h>
+#include <webkitdom/WebKitDOMTestSerializedScriptValueInterface.h>
 #if ENABLE(Condition1) || ENABLE(Condition2)
 
 namespace WebKit {
index e8092a5..114fe54 100644 (file)
@@ -1,3 +1,20 @@
+2012-12-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Install GObject DOM bindings headers in its own directory
+        https://bugs.webkit.org/show_bug.cgi?id=104663
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * GNUmakefile.am: Add webkitdom.h.
+        * webkit/webkitdom.h: Compatibility header just including the new
+        one.
+        * webkit/webkitwebframe.cpp: Update includes.
+        * webkit/webkitwebframe.h: Ditto.
+        * webkit/webkitwebinspector.cpp: Ditto.
+        * webkit/webkitwebinspector.h: Ditto.
+        * webkit/webkitwebview.cpp: Ditto.
+        * webkit/webkitwebview.h: Ditto.
+
 2012-12-11  Mike West  <mkwst@chromium.org>
 
         Web Inspector: ConsoleTypes should not expose MessageType - it should be private to inspector.
index a7dc2f5..e0d8cea 100644 (file)
@@ -45,6 +45,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPF
        -I$(WebKit)/WebCoreSupport \
        -I$(WebKit)/webkit \
        -I$(GENSOURCES_WEBKIT) \
+       -I$(GENSOURCES_WEBKITDOM) \
        -ISource/WebKit/gtk/webkit \
        $(global_cppflags) \
        $(webcore_cppflags) \
@@ -127,6 +128,7 @@ webkitgtk_static_h_api += \
        $(srcdir)/Source/WebKit/gtk/webkit/webkit.h \
        $(srcdir)/Source/WebKit/gtk/webkit/webkitapplicationcache.h \
        $(srcdir)/Source/WebKit/gtk/webkit/webkitdefines.h \
+       $(srcdir)/Source/WebKit/gtk/webkit/webkitdom.h \
        $(srcdir)/Source/WebKit/gtk/webkit/webkitdownload.h \
        $(srcdir)/Source/WebKit/gtk/webkit/webkiterror.h \
        $(srcdir)/Source/WebKit/gtk/webkit/webkitfavicondatabase.h \
diff --git a/Source/WebKit/gtk/webkit/webkitdom.h b/Source/WebKit/gtk/webkit/webkitdom.h
new file mode 100644 (file)
index 0000000..84b9ccd
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2012 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __webkitdom_h__
+#define __webkitdom_h__
+
+#include <webkitdom/webkitdom.h>
+
+#endif
index 1e7c4c3..975d879 100644 (file)
@@ -56,9 +56,9 @@
 #include "SubstituteData.h"
 #include "TextIterator.h"
 #include "WebKitAccessibleWrapperAtk.h"
+#include "WebKitDOMDocumentPrivate.h"
+#include "WebKitDOMRangePrivate.h"
 #include "markup.h"
-#include "webkit/WebKitDOMDocumentPrivate.h"
-#include "webkit/WebKitDOMRangePrivate.h"
 #include "webkitenumtypes.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
index 1b5b8ac..9014109 100644 (file)
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-
 #include <JavaScriptCore/JSBase.h>
-
 #include <webkit/webkitdefines.h>
-#include <webkit/webkitdomdefines.h>
 #include <webkit/webkitnetworkrequest.h>
 #include <webkit/webkitwebdatasource.h>
+#include <webkitdom/webkitdom.h>
 
 G_BEGIN_DECLS
 
index 164e463..bbf5d2d 100644 (file)
@@ -34,7 +34,7 @@
 #include "Page.h"
 #include "RenderLayer.h"
 #include "RenderView.h"
-#include "webkit/WebKitDOMNodePrivate.h"
+#include "WebKitDOMNodePrivate.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
 #include "webkitwebinspectorprivate.h"
index c8cd8c6..9af4aac 100644 (file)
@@ -22,8 +22,8 @@
 
 #include <glib-object.h>
 
-#include <webkit/webkitdomdefines.h>
 #include <webkit/webkitdefines.h>
+#include <webkitdom/webkitdom.h>
 
 G_BEGIN_DECLS
 
index 14a1308..f530489 100644 (file)
@@ -83,7 +83,7 @@
 #include "RuntimeEnabledFeatures.h"
 #include "ScriptValue.h"
 #include "Settings.h"
-#include "webkit/WebKitDOMDocumentPrivate.h"
+#include "WebKitDOMDocumentPrivate.h"
 #include "webkitdownload.h"
 #include "webkitdownloadprivate.h"
 #include "webkitenumtypes.h"
index 9c84263..5c09db6 100644 (file)
 #include <gtk/gtk.h>
 #include <libsoup/soup.h>
 #include <JavaScriptCore/JSBase.h>
-
 #include <webkit/webkitdefines.h>
-#include <webkit/webkitdom.h>
 #include <webkit/webkitfilechooserrequest.h>
 #include <webkit/webkitwebbackforwardlist.h>
 #include <webkit/webkitwebframe.h>
 #include <webkit/webkitwebhistoryitem.h>
 #include <webkit/webkitwebsettings.h>
+#include <webkitdom/webkitdom.h>
 
 G_BEGIN_DECLS