Changeset 133893 in webkit


Ignore:
Timestamp:
Nov 8, 2012 6:34:47 AM (11 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Clean up includes in GObject DOM bindings code
​https://bugs.webkit.org/show_bug.cgi?id=101077

Reviewed by Kentaro Hara.

Remove some headers included multiple times for the same file and
fix consistency in the includes style.

  • bindings/gobject/DOMObjectCache.cpp:
  • bindings/gobject/GObjectEventListener.cpp:
  • bindings/gobject/GObjectEventListener.h:
  • bindings/gobject/WebKitDOMBinding.cpp:
  • bindings/gobject/WebKitDOMBinding.h:
  • bindings/gobject/WebKitDOMEventTarget.cpp:
  • bindings/gobject/WebKitDOMEventTarget.h:
  • bindings/gobject/WebKitDOMEventTargetPrivate.h:

(WebKit):

  • bindings/gobject/WebKitDOMObject.cpp:
  • bindings/gobject/WebKitDOMObject.h:
  • bindings/gobject/WebKitHTMLElementWrapperFactory.cpp:
  • bindings/gobject/WebKitHTMLElementWrapperFactory.h:
  • bindings/scripts/CodeGeneratorGObject.pm:

(GenerateHeader):
(GenerateFunction):
(Generate):
(WriteData):

  • bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp:
  • bindings/scripts/test/GObject/WebKitDOMFloat64Array.h:
  • bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h:
  • bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
  • bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h:
  • bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h:
  • bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
  • bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestException.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestException.h:
  • bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
  • bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h:
  • bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h:
  • bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestNode.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestNode.h:
  • bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestObj.h:
  • bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h:
  • bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
  • bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
  • bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h:
Location:
trunk/Source/WebCore
Files:
53 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r133892 r133893  
     12012-11-08  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Clean up includes in GObject DOM bindings code
     4        https://bugs.webkit.org/show_bug.cgi?id=101077
     5
     6        Reviewed by Kentaro Hara.
     7
     8        Remove some headers included multiple times for the same file and
     9        fix consistency in the includes style.
     10
     11        * bindings/gobject/DOMObjectCache.cpp:
     12        * bindings/gobject/GObjectEventListener.cpp:
     13        * bindings/gobject/GObjectEventListener.h:
     14        * bindings/gobject/WebKitDOMBinding.cpp:
     15        * bindings/gobject/WebKitDOMBinding.h:
     16        * bindings/gobject/WebKitDOMEventTarget.cpp:
     17        * bindings/gobject/WebKitDOMEventTarget.h:
     18        * bindings/gobject/WebKitDOMEventTargetPrivate.h:
     19        (WebKit):
     20        * bindings/gobject/WebKitDOMObject.cpp:
     21        * bindings/gobject/WebKitDOMObject.h:
     22        * bindings/gobject/WebKitHTMLElementWrapperFactory.cpp:
     23        * bindings/gobject/WebKitHTMLElementWrapperFactory.h:
     24        * bindings/scripts/CodeGeneratorGObject.pm:
     25        (GenerateHeader):
     26        (GenerateFunction):
     27        (Generate):
     28        (WriteData):
     29        * bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp:
     30        * bindings/scripts/test/GObject/WebKitDOMFloat64Array.h:
     31        * bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h:
     32        * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp:
     33        * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h:
     34        * bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h:
     35        * bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:
     36        * bindings/scripts/test/GObject/WebKitDOMTestCallback.h:
     37        * bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h:
     38        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp:
     39        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h:
     40        * bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h:
     41        * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp:
     42        * bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h:
     43        * bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h:
     44        * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp:
     45        * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
     46        * bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h:
     47        * bindings/scripts/test/GObject/WebKitDOMTestException.cpp:
     48        * bindings/scripts/test/GObject/WebKitDOMTestException.h:
     49        * bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h:
     50        * bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp:
     51        * bindings/scripts/test/GObject/WebKitDOMTestInterface.h:
     52        * bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h:
     53        * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp:
     54        * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h:
     55        * bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h:
     56        * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp:
     57        * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h:
     58        * bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h:
     59        * bindings/scripts/test/GObject/WebKitDOMTestNode.cpp:
     60        * bindings/scripts/test/GObject/WebKitDOMTestNode.h:
     61        * bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h:
     62        * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp:
     63        * bindings/scripts/test/GObject/WebKitDOMTestObj.h:
     64        * bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h:
     65        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp:
     66        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h:
     67        * bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h:
     68
    1692012-11-08  Dan Carney  <dcarney@google.com>
    270

  • trunk/Source/WebCore/bindings/gobject/DOMObjectCache.cpp

    r131820 r133893  
    2222#include "Document.h"
    2323#include "Node.h"
    24 #include "glib-object.h"
     24#include <glib-object.h>
    2525#include <wtf/HashMap.h>
    2626

  • trunk/Source/WebCore/bindings/gobject/GObjectEventListener.cpp

    r95901 r133893  
    2121
    2222#include "Event.h"
    23 #include "EventListener.h"
    24 #include "webkit/WebKitDOMEvent.h"
    25 #include "webkit/WebKitDOMEventPrivate.h"
     23#include "WebKitDOMEvent.h"
     24#include "WebKitDOMEventPrivate.h"
    2625#include <glib-object.h>
    27 #include <glib.h>
    2826#include <wtf/HashMap.h>
    2927

  • trunk/Source/WebCore/bindings/gobject/GObjectEventListener.h

    r95901 r133893  
    2222#include "EventListener.h"
    2323#include "EventTarget.h"
    24 
    2524#include <wtf/RefPtr.h>
    2625#include <wtf/text/CString.h>

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMBinding.cpp

    r95901 r133893  
    3535#include "WebKitDOMElementPrivate.h"
    3636#include "WebKitDOMEventPrivate.h"
     37#include "WebKitDOMMouseEventPrivate.h"
    3738#include "WebKitDOMNode.h"
    3839#include "WebKitDOMNodePrivate.h"
     40#include "WebKitDOMUIEventPrivate.h"
    3941#include "WebKitHTMLElementWrapperFactory.h"
    40 #include "webkit/WebKitDOMMouseEventPrivate.h"
    41 #include "webkit/WebKitDOMUIEventPrivate.h"
    4242
    4343namespace WebKit {

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMBinding.h

    r95901 r133893  
    2525#define WebKitDOMBinding_h
    2626
    27 #include "webkit/webkitdomdefines.h"
    28 #include <glib.h>
     27#include <webkit/webkitdomdefines.h>
    2928
    3029namespace WebCore {

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp

    r95901 r133893  
    3232#include "WebKitDOMEventTarget.h"
    3333
    34 #include "EventTarget.h"
    3534#include "WebKitDOMEvent.h"
     35#include "WebKitDOMEventTargetPrivate.h"
    3636
    3737typedef WebKitDOMEventTargetIface WebKitDOMEventTargetInterface;

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.h

    r95901 r133893  
    2020#define WebKitDOMEventTarget_h
    2121
    22 #include "webkit/webkitdomdefines.h"
    2322#include <glib-object.h>
    2423#include <webkit/webkitdefines.h>
     24#include <webkit/webkitdomdefines.h>
    2525
    2626G_BEGIN_DECLS

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h

    r95901 r133893  
    2222
    2323#include "EventTarget.h"
    24 #include <glib-object.h>
    2524#include <webkit/WebKitDOMEventTarget.h>
    2625
    2726namespace WebKit {
    28 WebCore::EventTarget*
    29 core(WebKitDOMEventTarget *request);
     27WebCore::EventTarget* core(WebKitDOMEventTarget* request);
    3028} // namespace WebKit
    3129

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMObject.cpp

    r95901 r133893  
    99#include "WebKitDOMObject.h"
    1010
    11 #include "glib-object.h"
    1211#include "WebKitDOMBinding.h"
    1312
    … …  
    1716};
    1817
    19 G_DEFINE_TYPE(WebKitDOMObject, webkit_dom_object, G_TYPE_OBJECT);
     18G_DEFINE_TYPE(WebKitDOMObject, webkit_dom_object, G_TYPE_OBJECT)
    2019
    2120static void webkit_dom_object_init(WebKitDOMObject* object)

  • trunk/Source/WebCore/bindings/gobject/WebKitDOMObject.h

    r95901 r133893  
    2626#define WebKitDOMObject_h
    2727
    28 #include "glib-object.h"
    29 #include "webkit/webkitdomdefines.h"
     28#include <glib-object.h>
    3029#include <webkit/webkitdefines.h>
     30#include <webkit/webkitdomdefines.h>
    3131
    3232G_BEGIN_DECLS

  • trunk/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp

    r106373 r133893  
    9393#include "HTMLUListElement.h"
    9494#include "HTMLVideoElement.h"
    95 
    96 #include "webkit/WebKitDOMHTMLAnchorElementPrivate.h"
    97 #include "webkit/WebKitDOMHTMLAppletElementPrivate.h"
    98 #include "webkit/WebKitDOMHTMLAreaElementPrivate.h"
    99 #include "webkit/WebKitDOMHTMLBRElementPrivate.h"
    100 #include "webkit/WebKitDOMHTMLBaseElementPrivate.h"
    101 #include "webkit/WebKitDOMHTMLBaseFontElementPrivate.h"
    102 #include "webkit/WebKitDOMHTMLBodyElementPrivate.h"
    103 #include "webkit/WebKitDOMHTMLButtonElementPrivate.h"
    104 #include "webkit/WebKitDOMHTMLCanvasElementPrivate.h"
    105 #include "webkit/WebKitDOMHTMLDListElementPrivate.h"
    106 #include "webkit/WebKitDOMHTMLDirectoryElementPrivate.h"
    107 #include "webkit/WebKitDOMHTMLDivElementPrivate.h"
    108 #include "webkit/WebKitDOMHTMLElementPrivate.h"
    109 #include "webkit/WebKitDOMHTMLEmbedElementPrivate.h"
    110 #include "webkit/WebKitDOMHTMLFieldSetElementPrivate.h"
    111 #include "webkit/WebKitDOMHTMLFontElementPrivate.h"
    112 #include "webkit/WebKitDOMHTMLFormElementPrivate.h"
    113 #include "webkit/WebKitDOMHTMLFrameElementPrivate.h"
    114 #include "webkit/WebKitDOMHTMLFrameSetElementPrivate.h"
    115 #include "webkit/WebKitDOMHTMLHRElementPrivate.h"
    116 #include "webkit/WebKitDOMHTMLHeadElementPrivate.h"
    117 #include "webkit/WebKitDOMHTMLHeadingElementPrivate.h"
    118 #include "webkit/WebKitDOMHTMLHtmlElementPrivate.h"
    119 #include "webkit/WebKitDOMHTMLIFrameElementPrivate.h"
    120 #include "webkit/WebKitDOMHTMLImageElementPrivate.h"
    121 #include "webkit/WebKitDOMHTMLInputElementPrivate.h"
    122 #include "webkit/WebKitDOMHTMLKeygenElementPrivate.h"
    123 #include "webkit/WebKitDOMHTMLLIElementPrivate.h"
    124 #include "webkit/WebKitDOMHTMLLabelElementPrivate.h"
    125 #include "webkit/WebKitDOMHTMLLegendElementPrivate.h"
    126 #include "webkit/WebKitDOMHTMLLinkElementPrivate.h"
    127 #include "webkit/WebKitDOMHTMLMapElementPrivate.h"
    128 #include "webkit/WebKitDOMHTMLMarqueeElementPrivate.h"
    129 #include "webkit/WebKitDOMHTMLMenuElementPrivate.h"
    130 #include "webkit/WebKitDOMHTMLMetaElementPrivate.h"
    131 #include "webkit/WebKitDOMHTMLModElementPrivate.h"
    132 #include "webkit/WebKitDOMHTMLOListElementPrivate.h"
    133 #include "webkit/WebKitDOMHTMLObjectElementPrivate.h"
    134 #include "webkit/WebKitDOMHTMLOptGroupElementPrivate.h"
    135 #include "webkit/WebKitDOMHTMLOptionElementPrivate.h"
    136 #include "webkit/WebKitDOMHTMLParagraphElementPrivate.h"
    137 #include "webkit/WebKitDOMHTMLParamElementPrivate.h"
    138 #include "webkit/WebKitDOMHTMLPreElementPrivate.h"
    139 #include "webkit/WebKitDOMHTMLQuoteElementPrivate.h"
    140 #include "webkit/WebKitDOMHTMLScriptElementPrivate.h"
    141 #include "webkit/WebKitDOMHTMLSelectElementPrivate.h"
    142 #include "webkit/WebKitDOMHTMLStyleElementPrivate.h"
    143 #include "webkit/WebKitDOMHTMLTableCaptionElementPrivate.h"
    144 #include "webkit/WebKitDOMHTMLTableCellElementPrivate.h"
    145 #include "webkit/WebKitDOMHTMLTableColElementPrivate.h"
    146 #include "webkit/WebKitDOMHTMLTableElementPrivate.h"
    147 #include "webkit/WebKitDOMHTMLTableRowElementPrivate.h"
    148 #include "webkit/WebKitDOMHTMLTableSectionElementPrivate.h"
    149 #include "webkit/WebKitDOMHTMLTextAreaElementPrivate.h"
    150 #include "webkit/WebKitDOMHTMLTitleElementPrivate.h"
    151 #include "webkit/WebKitDOMHTMLUListElementPrivate.h"
    152 #include "webkit/webkitdom.h"
     95#include "WebKitDOMHTMLAnchorElementPrivate.h"
     96#include "WebKitDOMHTMLAppletElementPrivate.h"
     97#include "WebKitDOMHTMLAreaElementPrivate.h"
     98#include "WebKitDOMHTMLBRElementPrivate.h"
     99#include "WebKitDOMHTMLBaseElementPrivate.h"
     100#include "WebKitDOMHTMLBaseFontElementPrivate.h"
     101#include "WebKitDOMHTMLBodyElementPrivate.h"
     102#include "WebKitDOMHTMLButtonElementPrivate.h"
     103#include "WebKitDOMHTMLCanvasElementPrivate.h"
     104#include "WebKitDOMHTMLDListElementPrivate.h"
     105#include "WebKitDOMHTMLDirectoryElementPrivate.h"
     106#include "WebKitDOMHTMLDivElementPrivate.h"
     107#include "WebKitDOMHTMLElementPrivate.h"
     108#include "WebKitDOMHTMLEmbedElementPrivate.h"
     109#include "WebKitDOMHTMLFieldSetElementPrivate.h"
     110#include "WebKitDOMHTMLFontElementPrivate.h"
     111#include "WebKitDOMHTMLFormElementPrivate.h"
     112#include "WebKitDOMHTMLFrameElementPrivate.h"
     113#include "WebKitDOMHTMLFrameSetElementPrivate.h"
     114#include "WebKitDOMHTMLHRElementPrivate.h"
     115#include "WebKitDOMHTMLHeadElementPrivate.h"
     116#include "WebKitDOMHTMLHeadingElementPrivate.h"
     117#include "WebKitDOMHTMLHtmlElementPrivate.h"
     118#include "WebKitDOMHTMLIFrameElementPrivate.h"
     119#include "WebKitDOMHTMLImageElementPrivate.h"
     120#include "WebKitDOMHTMLInputElementPrivate.h"
     121#include "WebKitDOMHTMLKeygenElementPrivate.h"
     122#include "WebKitDOMHTMLLIElementPrivate.h"
     123#include "WebKitDOMHTMLLabelElementPrivate.h"
     124#include "WebKitDOMHTMLLegendElementPrivate.h"
     125#include "WebKitDOMHTMLLinkElementPrivate.h"
     126#include "WebKitDOMHTMLMapElementPrivate.h"
     127#include "WebKitDOMHTMLMarqueeElementPrivate.h"
     128#include "WebKitDOMHTMLMenuElementPrivate.h"
     129#include "WebKitDOMHTMLMetaElementPrivate.h"
     130#include "WebKitDOMHTMLModElementPrivate.h"
     131#include "WebKitDOMHTMLOListElementPrivate.h"
     132#include "WebKitDOMHTMLObjectElementPrivate.h"
     133#include "WebKitDOMHTMLOptGroupElementPrivate.h"
     134#include "WebKitDOMHTMLOptionElementPrivate.h"
     135#include "WebKitDOMHTMLParagraphElementPrivate.h"
     136#include "WebKitDOMHTMLParamElementPrivate.h"
     137#include "WebKitDOMHTMLPreElementPrivate.h"
     138#include "WebKitDOMHTMLQuoteElementPrivate.h"
     139#include "WebKitDOMHTMLScriptElementPrivate.h"
     140#include "WebKitDOMHTMLSelectElementPrivate.h"
     141#include "WebKitDOMHTMLStyleElementPrivate.h"
     142#include "WebKitDOMHTMLTableCaptionElementPrivate.h"
     143#include "WebKitDOMHTMLTableCellElementPrivate.h"
     144#include "WebKitDOMHTMLTableColElementPrivate.h"
     145#include "WebKitDOMHTMLTableElementPrivate.h"
     146#include "WebKitDOMHTMLTableRowElementPrivate.h"
     147#include "WebKitDOMHTMLTableSectionElementPrivate.h"
     148#include "WebKitDOMHTMLTextAreaElementPrivate.h"
     149#include "WebKitDOMHTMLTitleElementPrivate.h"
     150#include "WebKitDOMHTMLUListElementPrivate.h"
     151#include "webkitdom.h"
     152#include <wtf/text/CString.h>
    153153
    154154#if ENABLE(VIDEO)
    155 #include "webkit/WebKitDOMHTMLAudioElementPrivate.h"
    156 #include "webkit/WebKitDOMHTMLVideoElementPrivate.h"
     155#include "WebKitDOMHTMLAudioElementPrivate.h"
     156#include "WebKitDOMHTMLVideoElementPrivate.h"
    157157#endif
    158158
    159159#if ENABLE(VIDEO_TRACK)
    160 #include "webkit/WebKitDOMTextTrackCueListPrivate.h"
    161 #include "webkit/WebKitDOMTextTrackCuePrivate.h"
    162 #include "webkit/WebKitDOMTextTrackListPrivate.h"
    163 #include "webkit/WebKitDOMTextTrackPrivate.h"
    164 #include "webkit/WebKitDOMTrackEventPrivate.h"
     160#include "WebKitDOMTextTrackCueListPrivate.h"
     161#include "WebKitDOMTextTrackCuePrivate.h"
     162#include "WebKitDOMTextTrackListPrivate.h"
     163#include "WebKitDOMTextTrackPrivate.h"
     164#include "WebKitDOMTrackEventPrivate.h"
    165165#endif
    166  
    167 #include <wtf/text/CString.h>
    168166
    169167namespace WebKit {

  • trunk/Source/WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h

    r95901 r133893  
    2929
    3030#include "HTMLElement.h"
    31 #include "glib-object.h"
    32 
    33 #include <wtf/Forward.h>
    34 
    35 namespace WebCore {
    36 class HTMLElement;
    37 }
    3831
    3932namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm

    r131969 r133893  
    714714    $implContent = << "EOF";
    715715G_BEGIN_DECLS
     716
    716717EOF
    717718
    … …  
    746747}
    747748
    748 sub getIncludeHeader {
    749     my $type = shift;
    750     my $name = GetClassName($type);
    751 
    752     return "" if $type eq "int";
    753     return "" if $type eq "long";
    754     return "" if $type eq "long long";
    755     return "" if $type eq "short";
    756     return "" if $type eq "char";
    757     return "" if $type eq "float";
    758     return "" if $type eq "double";
    759     return "" if $type eq "unsigned";
    760     return "" if $type eq "unsigned int";
    761     return "" if $type eq "unsigned long";
    762     return "" if $type eq "unsigned long long";
    763     return "" if $type eq "unsigned short";
    764     return "" if $type eq "DOMTimeStamp";
    765     return "" if $type eq "EventListener";
    766     return "" if $type eq "MediaQueryListListener";
    767     return "" if $type eq "unsigned char";
    768     return "" if $type eq "DOMString";
    769     return "" if $type eq "float";
    770     return "" if $type eq "boolean";
    771     return "" if $type eq "void";
    772     return "" if $type eq "CompareHow";
    773 
    774     return "$name.h";
    775 }
    776 
    777 sub addIncludeInBody {
    778     my $type = shift;
    779 
    780     if ($type eq "DOMObject") {
    781         return;
    782     }
    783 
    784     my $header = getIncludeHeader($type);
    785     if ($header eq "") {
    786         return;
    787     }
    788    
    789     if (IsGDOMClassType($type)) {
    790         $implIncludes{"webkit/$header"} = 1;
    791     } else {
    792         $implIncludes{$header} = 1
    793     }
    794 }
    795 
    796749sub GenerateFunction {
    797750    my ($object, $interfaceName, $function, $prefix, $parentNode) = @_;
    … …  
    829782            return;
    830783        }
    831         addIncludeInBody($paramIDLType);
     784
    832785        my $paramType = GetGlibTypeName($paramIDLType);
    833786        my $const = $paramType eq "gchar*" ? "const " : "";
    … …  
    839792        if ($paramIsGDOMType) {
    840793            if ($paramIDLType ne "DOMObject") {
    841                 $implIncludes{"webkit/WebKitDOM${paramIDLType}Private.h"} = 1;
     794                $implIncludes{"WebKitDOM${paramIDLType}Private.h"} = 1;
    842795            }
    843796        }
    … …  
    850803    if ($returnType ne "void" && $returnValueIsGDOMType && $functionSigType ne "DOMObject") {
    851804        if ($functionSigType ne "EventTarget") {
    852             $implIncludes{"webkit/WebKitDOM${functionSigType}Private.h"} = 1;
    853             $implIncludes{"webkit/WebKitDOM${functionSigType}.h"} = 1;
     805            $implIncludes{"WebKitDOM${functionSigType}Private.h"} = 1;
    854806        } else {
    855807            $implIncludes{"WebKitDOM${functionSigType}.h"} = 1;
    856808        }
    857 
    858         $implIncludes{"${functionSigType}.h"} = 1;
    859809    }
    860810
    … …  
    13351285    push(@cPrefix, "\n");
    13361286
    1337     $implIncludes{"webkitdefines.h"} = 1;
    13381287    $implIncludes{"webkitglobalsprivate.h"} = 1;
    1339     $implIncludes{"webkitmarshal.h"} = 1;
    13401288    $implIncludes{"DOMObjectCache.h"} = 1;
    13411289    $implIncludes{"WebKitDOMBinding.h"} = 1;
    13421290    $implIncludes{"gobject/ConvertToUTF8String.h"} = 1;
    1343     $implIncludes{"webkit/$className.h"} = 1;
    1344     $implIncludes{"webkit/${className}Private.h"} = 1;
    1345     $implIncludes{"${interfaceName}.h"} = 1;
     1291    $implIncludes{"${className}Private.h"} = 1;
    13461292    $implIncludes{"JSMainThreadExecState.h"} = 1;
    13471293    $implIncludes{"ExceptionCode.h"} = 1;
    … …  
    13791325    my $filename = "$outputDir/" . $className . "Private.h";
    13801326    my $guard = "${className}Private_h";
    1381     my $parentClassName = GetParentClassName($dataNode);
    13821327
    13831328    # Add the guard if the 'Conditional' extended attribute exists
    … …  
    13941339
    13951340#include "${interfaceName}.h"
    1396 #include <glib-object.h>
    1397 #include <webkit/${parentClassName}.h>
     1341#include <webkit/${className}.h>
    13981342EOF
    13991343
    … …  
    14551399    # Remove the implementation header from the list of included files.
    14561400    %includesCopy = %implIncludes;
    1457     delete ($includesCopy{"webkit/$installedHeaderFilename"});
    14581401    print IMPL map { "#include \"$_\"\n" } sort keys(%includesCopy);
    14591402
    1460     print IMPL "#include <glib-object.h>\n";
    14611403    print IMPL "#include <wtf/GetPtr.h>\n";
    14621404    print IMPL "#include <wtf/RefPtr.h>\n\n";

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp

    r113450 r133893  
    2424#include "DOMObjectCache.h"
    2525#include "ExceptionCode.h"
    26 #include "Float64Array.h"
    27 #include "Int32Array.h"
    2826#include "JSMainThreadExecState.h"
    2927#include "WebKitDOMBinding.h"
     28#include "WebKitDOMFloat32ArrayPrivate.h"
     29#include "WebKitDOMFloat64ArrayPrivate.h"
     30#include "WebKitDOMInt32ArrayPrivate.h"
    3031#include "gobject/ConvertToUTF8String.h"
    31 #include "webkit/WebKitDOMFloat32Array.h"
    32 #include "webkit/WebKitDOMFloat32ArrayPrivate.h"
    33 #include "webkit/WebKitDOMFloat64ArrayPrivate.h"
    34 #include "webkit/WebKitDOMInt32Array.h"
    35 #include "webkit/WebKitDOMInt32ArrayPrivate.h"
    36 #include "webkitdefines.h"
    3732#include "webkitglobalsprivate.h"
    38 #include "webkitmarshal.h"
    39 #include <glib-object.h>
    4033#include <wtf/GetPtr.h>
    4134#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h

    r113450 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_FLOAT64ARRAY            (webkit_dom_float64array_get_type())
    3132#define WEBKIT_DOM_FLOAT64ARRAY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_FLOAT64ARRAY, WebKitDOMFloat64Array))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h

    r113450 r133893  
    2323
    2424#include "Float64Array.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMArrayBufferView.h>
     25#include <webkit/WebKitDOMFloat64Array.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp

    r116949 r133893  
    2525#include "ExceptionCode.h"
    2626#include "JSMainThreadExecState.h"
    27 #include "TestActiveDOMObject.h"
    2827#include "WebKitDOMBinding.h"
     28#include "WebKitDOMNodePrivate.h"
     29#include "WebKitDOMTestActiveDOMObjectPrivate.h"
    2930#include "gobject/ConvertToUTF8String.h"
    30 #include "webkit/WebKitDOMNode.h"
    31 #include "webkit/WebKitDOMNodePrivate.h"
    32 #include "webkit/WebKitDOMTestActiveDOMObjectPrivate.h"
    33 #include "webkitdefines.h"
    3431#include "webkitglobalsprivate.h"
    35 #include "webkitmarshal.h"
    36 #include <glib-object.h>
    3732#include <wtf/GetPtr.h>
    3833#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h

    r113450 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT            (webkit_dom_test_active_dom_object_get_type())
    3132#define WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT, WebKitDOMTestActiveDOMObject))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h

    r113450 r133893  
    2323
    2424#include "TestActiveDOMObject.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestActiveDOMObject.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp

    r115438 r133893  
    2525#include "ExceptionCode.h"
    2626#include "JSMainThreadExecState.h"
    27 #include "TestCallback.h"
    2827#include "WebKitDOMBinding.h"
     28#include "WebKitDOMClass1Private.h"
     29#include "WebKitDOMClass2Private.h"
     30#include "WebKitDOMClass3Private.h"
     31#include "WebKitDOMClass8Private.h"
     32#include "WebKitDOMDOMStringListPrivate.h"
     33#include "WebKitDOMTestCallbackPrivate.h"
     34#include "WebKitDOMThisClassPrivate.h"
    2935#include "gobject/ConvertToUTF8String.h"
    30 #include "webkit/WebKitDOMClass1.h"
    31 #include "webkit/WebKitDOMClass1Private.h"
    32 #include "webkit/WebKitDOMClass2.h"
    33 #include "webkit/WebKitDOMClass2Private.h"
    34 #include "webkit/WebKitDOMClass3.h"
    35 #include "webkit/WebKitDOMClass3Private.h"
    36 #include "webkit/WebKitDOMClass8.h"
    37 #include "webkit/WebKitDOMClass8Private.h"
    38 #include "webkit/WebKitDOMDOMStringList.h"
    39 #include "webkit/WebKitDOMDOMStringListPrivate.h"
    40 #include "webkit/WebKitDOMTestCallbackPrivate.h"
    41 #include "webkit/WebKitDOMThisClass.h"
    42 #include "webkit/WebKitDOMThisClassPrivate.h"
    43 #include "webkitdefines.h"
    4436#include "webkitglobalsprivate.h"
    45 #include "webkitmarshal.h"
    46 #include <glib-object.h>
    4737#include <wtf/GetPtr.h>
    4838#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h

    r114502 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_CALLBACK            (webkit_dom_test_callback_get_type())
    3132#define WEBKIT_DOM_TEST_CALLBACK(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_CALLBACK, WebKitDOMTestCallback))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h

    r113450 r133893  
    2323
    2424#include "TestCallback.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestCallback.h>
    2726#if ENABLE(SQL_DATABASE)
    2827

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp

    r113450 r133893  
    2525#include "ExceptionCode.h"
    2626#include "JSMainThreadExecState.h"
    27 #include "TestCustomNamedGetter.h"
    2827#include "WebKitDOMBinding.h"
     28#include "WebKitDOMTestCustomNamedGetterPrivate.h"
    2929#include "gobject/ConvertToUTF8String.h"
    30 #include "webkit/WebKitDOMTestCustomNamedGetterPrivate.h"
    31 #include "webkitdefines.h"
    3230#include "webkitglobalsprivate.h"
    33 #include "webkitmarshal.h"
    34 #include <glib-object.h>
    3531#include <wtf/GetPtr.h>
    3632#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h

    r113450 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER            (webkit_dom_test_custom_named_getter_get_type())
    3132#define WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, WebKitDOMTestCustomNamedGetter))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h

    r113450 r133893  
    2323
    2424#include "TestCustomNamedGetter.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestCustomNamedGetter.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp

    r116949 r133893  
    2525#include "ExceptionCode.h"
    2626#include "JSMainThreadExecState.h"
    27 #include "TestEventConstructor.h"
    2827#include "WebKitDOMBinding.h"
     28#include "WebKitDOMTestEventConstructorPrivate.h"
    2929#include "gobject/ConvertToUTF8String.h"
    30 #include "webkit/WebKitDOMTestEventConstructorPrivate.h"
    31 #include "webkitdefines.h"
    3230#include "webkitglobalsprivate.h"
    33 #include "webkitmarshal.h"
    34 #include <glib-object.h>
    3531#include <wtf/GetPtr.h>
    3632#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h

    r113450 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR            (webkit_dom_test_event_constructor_get_type())
    3132#define WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR, WebKitDOMTestEventConstructor))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h

    r113450 r133893  
    2323
    2424#include "TestEventConstructor.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestEventConstructor.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp

    r113450 r133893  
    2626#include "GObjectEventListener.h"
    2727#include "JSMainThreadExecState.h"
    28 #include "Node.h"
    29 #include "TestEventTarget.h"
    3028#include "WebKitDOMBinding.h"
    3129#include "WebKitDOMEventPrivate.h"
    3230#include "WebKitDOMEventTarget.h"
     31#include "WebKitDOMNodePrivate.h"
     32#include "WebKitDOMTestEventTargetPrivate.h"
    3333#include "gobject/ConvertToUTF8String.h"
    34 #include "webkit/WebKitDOMEvent.h"
    35 #include "webkit/WebKitDOMEventPrivate.h"
    36 #include "webkit/WebKitDOMNode.h"
    37 #include "webkit/WebKitDOMNodePrivate.h"
    38 #include "webkit/WebKitDOMTestEventTargetPrivate.h"
    39 #include "webkitdefines.h"
    4034#include "webkitglobalsprivate.h"
    41 #include "webkitmarshal.h"
    42 #include <glib-object.h>
    4335#include <wtf/GetPtr.h>
    4436#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h

    r113450 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_EVENT_TARGET            (webkit_dom_test_event_target_get_type())
    3132#define WEBKIT_DOM_TEST_EVENT_TARGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_EVENT_TARGET, WebKitDOMTestEventTarget))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h

    r113450 r133893  
    2323
    2424#include "TestEventTarget.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestEventTarget.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.cpp

    r116949 r133893  
    2525#include "ExceptionCode.h"
    2626#include "JSMainThreadExecState.h"
    27 #include "TestException.h"
    2827#include "WebKitDOMBinding.h"
     28#include "WebKitDOMTestExceptionPrivate.h"
    2929#include "gobject/ConvertToUTF8String.h"
    30 #include "webkit/WebKitDOMTestExceptionPrivate.h"
    31 #include "webkitdefines.h"
    3230#include "webkitglobalsprivate.h"
    33 #include "webkitmarshal.h"
    34 #include <glib-object.h>
    3531#include <wtf/GetPtr.h>
    3632#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestException.h

    r116172 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_EXCEPTION            (webkit_dom_test_exception_get_type())
    3132#define WEBKIT_DOM_TEST_EXCEPTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_EXCEPTION, WebKitDOMTestException))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestExceptionPrivate.h

    r116172 r133893  
    2323
    2424#include "TestException.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestException.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp

    r116949 r133893  
    2525#include "ExceptionCode.h"
    2626#include "JSMainThreadExecState.h"
    27 #include "Node.h"
    28 #include "TestInterface.h"
    29 #include "TestObj.h"
    3027#include "TestSupplemental.h"
    3128#include "WebKitDOMBinding.h"
     29#include "WebKitDOMNodePrivate.h"
     30#include "WebKitDOMTestInterfacePrivate.h"
     31#include "WebKitDOMTestObjPrivate.h"
    3232#include "gobject/ConvertToUTF8String.h"
    33 #include "webkit/WebKitDOMNode.h"
    34 #include "webkit/WebKitDOMNodePrivate.h"
    35 #include "webkit/WebKitDOMTestInterfacePrivate.h"
    36 #include "webkit/WebKitDOMTestObj.h"
    37 #include "webkit/WebKitDOMTestObjPrivate.h"
    38 #include "webkitdefines.h"
    3933#include "webkitglobalsprivate.h"
    40 #include "webkitmarshal.h"
    41 #include <glib-object.h>
    4234#include <wtf/GetPtr.h>
    4335#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h

    r113450 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_INTERFACE            (webkit_dom_test_interface_get_type())
    3132#define WEBKIT_DOM_TEST_INTERFACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_INTERFACE, WebKitDOMTestInterface))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h

    r113450 r133893  
    2323
    2424#include "TestInterface.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestInterface.h>
    2726#if ENABLE(Condition1) || ENABLE(Condition2)
    2827

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp

    r113450 r133893  
    2525#include "ExceptionCode.h"
    2626#include "JSMainThreadExecState.h"
    27 #include "TestMediaQueryListListener.h"
    2827#include "WebKitDOMBinding.h"
     28#include "WebKitDOMTestMediaQueryListListenerPrivate.h"
    2929#include "gobject/ConvertToUTF8String.h"
    30 #include "webkit/WebKitDOMTestMediaQueryListListenerPrivate.h"
    31 #include "webkitdefines.h"
    3230#include "webkitglobalsprivate.h"
    33 #include "webkitmarshal.h"
    34 #include <glib-object.h>
    3531#include <wtf/GetPtr.h>
    3632#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h

    r113450 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER            (webkit_dom_test_media_query_list_listener_get_type())
    3132#define WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER, WebKitDOMTestMediaQueryListListener))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h

    r113450 r133893  
    2323
    2424#include "TestMediaQueryListListener.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestMediaQueryListListener.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp

    r113450 r133893  
    2525#include "ExceptionCode.h"
    2626#include "JSMainThreadExecState.h"
    27 #include "TestNamedConstructor.h"
    2827#include "WebKitDOMBinding.h"
     28#include "WebKitDOMTestNamedConstructorPrivate.h"
    2929#include "gobject/ConvertToUTF8String.h"
    30 #include "webkit/WebKitDOMTestNamedConstructorPrivate.h"
    31 #include "webkitdefines.h"
    3230#include "webkitglobalsprivate.h"
    33 #include "webkitmarshal.h"
    34 #include <glib-object.h>
    3531#include <wtf/GetPtr.h>
    3632#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h

    r113450 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR            (webkit_dom_test_named_constructor_get_type())
    3132#define WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR, WebKitDOMTestNamedConstructor))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h

    r113450 r133893  
    2323
    2424#include "TestNamedConstructor.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestNamedConstructor.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.cpp

    r113751 r133893  
    2626#include "GObjectEventListener.h"
    2727#include "JSMainThreadExecState.h"
    28 #include "TestNode.h"
    2928#include "WebKitDOMBinding.h"
    3029#include "WebKitDOMEventPrivate.h"
    3130#include "WebKitDOMEventTarget.h"
     31#include "WebKitDOMTestNodePrivate.h"
    3232#include "gobject/ConvertToUTF8String.h"
    33 #include "webkit/WebKitDOMTestNodePrivate.h"
    34 #include "webkitdefines.h"
    3533#include "webkitglobalsprivate.h"
    36 #include "webkitmarshal.h"
    37 #include <glib-object.h>
    3834#include <wtf/GetPtr.h>
    3935#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNode.h

    r113751 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_NODE            (webkit_dom_test_node_get_type())
    3132#define WEBKIT_DOM_TEST_NODE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_NODE, WebKitDOMTestNode))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNodePrivate.h

    r113751 r133893  
    2323
    2424#include "TestNode.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMNode.h>
     25#include <webkit/WebKitDOMTestNode.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp

    r132667 r133893  
    2323
    2424#include "DOMObjectCache.h"
    25 #include "Document.h"
    2625#include "ExceptionCode.h"
    2726#include "HTMLNames.h"
    2827#include "JSMainThreadExecState.h"
    29 #include "SVGPoint.h"
    30 #include "TestObj.h"
    3128#include "WebKitDOMBinding.h"
    32 #include "any.h"
    33 #include "bool.h"
     29#include "WebKitDOMDictionaryPrivate.h"
     30#include "WebKitDOMDocumentPrivate.h"
     31#include "WebKitDOMIDBKeyPrivate.h"
     32#include "WebKitDOMNodePrivate.h"
     33#include "WebKitDOMSVGPointPrivate.h"
     34#include "WebKitDOMSerializedScriptValuePrivate.h"
     35#include "WebKitDOMTestObjPrivate.h"
     36#include "WebKitDOMaPrivate.h"
     37#include "WebKitDOManyPrivate.h"
     38#include "WebKitDOMbPrivate.h"
     39#include "WebKitDOMboolPrivate.h"
     40#include "WebKitDOMdPrivate.h"
     41#include "WebKitDOMePrivate.h"
    3442#include "gobject/ConvertToUTF8String.h"
    35 #include "webkit/WebKitDOMDictionary.h"
    36 #include "webkit/WebKitDOMDictionaryPrivate.h"
    37 #include "webkit/WebKitDOMDocument.h"
    38 #include "webkit/WebKitDOMDocumentPrivate.h"
    39 #include "webkit/WebKitDOMIDBKey.h"
    40 #include "webkit/WebKitDOMIDBKeyPrivate.h"
    41 #include "webkit/WebKitDOMNode.h"
    42 #include "webkit/WebKitDOMNodePrivate.h"
    43 #include "webkit/WebKitDOMSVGPoint.h"
    44 #include "webkit/WebKitDOMSVGPointPrivate.h"
    45 #include "webkit/WebKitDOMSerializedScriptValue.h"
    46 #include "webkit/WebKitDOMSerializedScriptValuePrivate.h"
    47 #include "webkit/WebKitDOMTestObjPrivate.h"
    48 #include "webkit/WebKitDOMa.h"
    49 #include "webkit/WebKitDOMaPrivate.h"
    50 #include "webkit/WebKitDOMany.h"
    51 #include "webkit/WebKitDOManyPrivate.h"
    52 #include "webkit/WebKitDOMb.h"
    53 #include "webkit/WebKitDOMbPrivate.h"
    54 #include "webkit/WebKitDOMbool.h"
    55 #include "webkit/WebKitDOMboolPrivate.h"
    56 #include "webkit/WebKitDOMd.h"
    57 #include "webkit/WebKitDOMdPrivate.h"
    58 #include "webkit/WebKitDOMe.h"
    59 #include "webkit/WebKitDOMePrivate.h"
    60 #include "webkitdefines.h"
    6143#include "webkitglobalsprivate.h"
    62 #include "webkitmarshal.h"
    63 #include <glib-object.h>
    6444#include <wtf/GetPtr.h>
    6545#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h

    r129779 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_OBJ            (webkit_dom_test_obj_get_type())
    3132#define WEBKIT_DOM_TEST_OBJ(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_OBJ, WebKitDOMTestObj))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h

    r113450 r133893  
    2323
    2424#include "TestObj.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestObj.h>
    2726
    2827namespace WebKit {

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp

    r116949 r133893  
    2525#include "ExceptionCode.h"
    2626#include "JSMainThreadExecState.h"
    27 #include "MessagePortArray.h"
    28 #include "SerializedScriptValue.h"
    29 #include "TestSerializedScriptValueInterface.h"
     27#include "WebKitDOMArrayPrivate.h"
    3028#include "WebKitDOMBinding.h"
     29#include "WebKitDOMMessagePortArrayPrivate.h"
     30#include "WebKitDOMSerializedScriptValuePrivate.h"
     31#include "WebKitDOMTestSerializedScriptValueInterfacePrivate.h"
    3132#include "gobject/ConvertToUTF8String.h"
    32 #include "webkit/WebKitDOMArray.h"
    33 #include "webkit/WebKitDOMArrayPrivate.h"
    34 #include "webkit/WebKitDOMMessagePortArray.h"
    35 #include "webkit/WebKitDOMMessagePortArrayPrivate.h"
    36 #include "webkit/WebKitDOMSerializedScriptValue.h"
    37 #include "webkit/WebKitDOMSerializedScriptValuePrivate.h"
    38 #include "webkit/WebKitDOMTestSerializedScriptValueInterfacePrivate.h"
    39 #include "webkitdefines.h"
    4033#include "webkitglobalsprivate.h"
    41 #include "webkitmarshal.h"
    42 #include <glib-object.h>
    4334#include <wtf/GetPtr.h>
    4435#include <wtf/RefPtr.h>

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h

    r114319 r133893  
    2828
    2929G_BEGIN_DECLS
     30
    3031#define WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE            (webkit_dom_test_serialized_script_value_interface_get_type())
    3132#define WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, WebKitDOMTestSerializedScriptValueInterface))

  • trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h

    r113450 r133893  
    2323
    2424#include "TestSerializedScriptValueInterface.h"
    25 #include <glib-object.h>
    26 #include <webkit/WebKitDOMObject.h>
     25#include <webkit/WebKitDOMTestSerializedScriptValueInterface.h>
    2726#if ENABLE(Condition1) || ENABLE(Condition2)
    2827
Note: See TracChangeset for help on using the changeset viewer.