Commit 730d0a9c authored by weinig@apple.com's avatar weinig@apple.com

WebCore:

        Reviewed by Mark Rowe.

        Rename kjs_window to JSDOMWindowBase.

        - Remove all unnecessary includes of JSDOMWindowBase.h, we prefer including
          JSDOMWindow.h

        * ChangeLog:
        * DerivedSources.make:
        * GNUmakefile.am:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * WebCoreSources.bkl:
        * bindings/js/JSCustomVoidCallback.cpp:
        * bindings/js/JSCustomXPathNSResolver.cpp:
        * bindings/js/JSDOMWindowBase.cpp: Copied from bindings/js/kjs_window.cpp.
        * bindings/js/JSDOMWindowBase.h: Copied from bindings/js/kjs_window.h.
        * bindings/js/JSDOMWindowCustom.cpp:
        * bindings/js/JSDatabaseCustom.cpp:
        * bindings/js/JSEventTargetBase.cpp:
        * bindings/js/JSEventTargetBase.h:
        * bindings/js/JSEventTargetNode.cpp:
        * bindings/js/JSHTMLDocumentCustom.cpp:
        * bindings/js/JSHTMLFrameSetElementCustom.cpp:
        * bindings/js/JSHistoryCustom.cpp:
        * bindings/js/JSLocation.cpp:
        * bindings/js/JSSQLTransactionCustom.cpp:
        * bindings/js/JSXMLHttpRequest.cpp:
        * bindings/js/ScheduledAction.cpp:
        * bindings/js/kjs_binding.cpp:
        * bindings/js/kjs_events.cpp:
        * bindings/js/kjs_navigator.cpp:
        * bindings/js/kjs_proxy.cpp:
        * bindings/js/kjs_window.cpp: Removed.
        * bindings/js/kjs_window.h: Removed.
        * bindings/scripts/CodeGeneratorJS.pm:
        * history/CachedPage.cpp:
        * loader/FrameLoader.cpp:
        * page/Chrome.cpp:
        * page/InspectorController.cpp:
        * page/mac/FrameMac.mm:
        * page/mac/WebCoreFrameBridge.mm:
        * page/qt/FrameQt.cpp:
        * page/win/FrameWin.cpp:
        * plugins/win/PluginViewWin.cpp:

WebKit/gtk:

        Reviewed by Mark Rowe.

        - Remove all unnecessary includes of JSDOMWindowBase.h, we prefer including
          JSDOMWindow.h

        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        * webkit/webkitwebframe.cpp:

WebKit/qt:

        Reviewed by Mark Rowe.

        - Remove all unnecessary includes of JSDOMWindowBase.h, we prefer including
          JSDOMWindow.h

        * Api/qwebframe.cpp:
        (QWebFrame::addToJSWindowObject):

WebKit/win:

        Reviewed by Mark Rowe.

        - Remove all unnecessary includes of JSDOMWindowBase.h, we prefer including
          JSDOMWindow.h

        * WebFrame.cpp:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@30787 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent be0b020e
2008-03-04 Sam Weinig <sam@webkit.org>
Reviewed by Mark Rowe.
Rename kjs_window to JSDOMWindowBase.
- Remove all unnecessary includes of JSDOMWindowBase.h, we prefer including
JSDOMWindow.h
* ChangeLog:
* DerivedSources.make:
* GNUmakefile.am:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* WebCoreSources.bkl:
* bindings/js/JSCustomVoidCallback.cpp:
* bindings/js/JSCustomXPathNSResolver.cpp:
* bindings/js/JSDOMWindowBase.cpp: Copied from bindings/js/kjs_window.cpp.
* bindings/js/JSDOMWindowBase.h: Copied from bindings/js/kjs_window.h.
* bindings/js/JSDOMWindowCustom.cpp:
* bindings/js/JSDatabaseCustom.cpp:
* bindings/js/JSEventTargetBase.cpp:
* bindings/js/JSEventTargetBase.h:
* bindings/js/JSEventTargetNode.cpp:
* bindings/js/JSHTMLDocumentCustom.cpp:
* bindings/js/JSHTMLFrameSetElementCustom.cpp:
* bindings/js/JSHistoryCustom.cpp:
* bindings/js/JSLocation.cpp:
* bindings/js/JSSQLTransactionCustom.cpp:
* bindings/js/JSXMLHttpRequest.cpp:
* bindings/js/ScheduledAction.cpp:
* bindings/js/kjs_binding.cpp:
* bindings/js/kjs_events.cpp:
* bindings/js/kjs_navigator.cpp:
* bindings/js/kjs_proxy.cpp:
* bindings/js/kjs_window.cpp: Removed.
* bindings/js/kjs_window.h: Removed.
* bindings/scripts/CodeGeneratorJS.pm:
* history/CachedPage.cpp:
* loader/FrameLoader.cpp:
* page/Chrome.cpp:
* page/InspectorController.cpp:
* page/mac/FrameMac.mm:
* page/mac/WebCoreFrameBridge.mm:
* page/qt/FrameQt.cpp:
* page/win/FrameWin.cpp:
* plugins/win/PluginViewWin.cpp:
2008-03-04 Mark Rowe <mrowe@apple.com>
Speculative Qt build fix.
......@@ -340,6 +340,7 @@ all : \
JSDOMParser.h \
JSDOMSelection.h \
JSDOMWindow.h \
JSDOMWindowBase.lut.h \
JSDatabase.h \
JSDocument.h \
JSDocumentFragment.h \
......@@ -601,7 +602,6 @@ all : \
XMLNames.cpp \
XPathGrammar.cpp \
kjs_navigator.lut.h \
kjs_window.lut.h \
tokenizer.cpp \
WebCore.exp \
#
......
......@@ -48,13 +48,13 @@ webcore_built_nosources += \
DerivedSources/DocTypeStrings.cpp \
DerivedSources/tokenizer.cpp \
DerivedSources/ColorData.c \
WebCore/bindings/js/JSDOMWindowBase.lut.h \
WebCore/bindings/js/JSEventTargetBase.lut.h \
WebCore/bindings/js/JSLocation.lut.h \
WebCore/bindings/js/JSRGBColor.lut.h \
WebCore/bindings/js/JSXMLHttpRequest.lut.h \
WebCore/bindings/js/JSXSLTProcessor.lut.h \
WebCore/bindings/js/kjs_navigator.lut.h \
WebCore/bindings/js/kjs_window.lut.h \
WebCore/bindings/js/JSHTMLInputElementBaseTable.cpp
webcore_built_sources += \
......@@ -463,6 +463,7 @@ webcore_sources += \
WebCore/bindings/js/JSCustomVoidCallback.cpp \
WebCore/bindings/js/JSCustomXPathNSResolver.cpp \
WebCore/bindings/js/JSDocumentCustom.cpp \
WebCore/bindings/js/JSDOMWindowBase.cpp \
WebCore/bindings/js/JSDOMWindowCustom.cpp \
WebCore/bindings/js/JSElementCustom.cpp \
WebCore/bindings/js/JSEventCustom.cpp \
......@@ -504,7 +505,6 @@ webcore_sources += \
WebCore/bindings/js/kjs_html.cpp \
WebCore/bindings/js/kjs_navigator.cpp \
WebCore/bindings/js/kjs_proxy.cpp \
WebCore/bindings/js/kjs_window.cpp \
WebCore/bindings/js/PausedTimeouts.cpp \
WebCore/bindings/js/ScheduledAction.cpp \
WebCore/css/CSSBorderImageValue.cpp \
......@@ -2054,9 +2054,9 @@ CLEANFILES += \
WebCore/bindings/js/JSEventTargetBase.lut.h \
WebCore/bindings/js/JSHTMLInputElementBaseTable.cpp \
WebCore/bindings/js/JSLocation.lut.h \
JSDOMWindowBase.lut.h \
JSRGBColor.lut.h \
JSXMLHttpRequest.lut.h \
JSXSLTProcessor.lut.h \
kjs_navigator.lut.h \
kjs_window.lut.h
kjs_navigator.lut.h
......@@ -244,13 +244,13 @@ SVGCSSVALUES = $$PWD/css/SVGCSSValueKeywords.in
STYLESHEETS_EMBED = $$PWD/css/html4.css
LUT_FILES += \
bindings/js/JSDOMWindowBase.cpp \
bindings/js/JSEventTargetBase.cpp \
bindings/js/JSLocation.cpp \
bindings/js/JSRGBColor.cpp \
bindings/js/JSXMLHttpRequest.cpp \
bindings/js/JSXSLTProcessor.cpp \
bindings/js/kjs_navigator.cpp \
bindings/js/kjs_window.cpp
bindings/js/kjs_navigator.cpp
LUT_TABLE_FILES += \
bindings/js/JSHTMLInputElementBase.cpp
......@@ -398,6 +398,7 @@ SOURCES += \
bindings/js/JSCustomVoidCallback.cpp \
bindings/js/JSCustomXPathNSResolver.cpp \
bindings/js/JSDocumentCustom.cpp \
bindings/js/JSDOMWindowBase.cpp \
bindings/js/JSDOMWindowCustom.cpp \
bindings/js/JSElementCustom.cpp \
bindings/js/JSEventCustom.cpp \
......@@ -439,7 +440,6 @@ SOURCES += \
bindings/js/kjs_html.cpp \
bindings/js/kjs_navigator.cpp \
bindings/js/kjs_proxy.cpp \
bindings/js/kjs_window.cpp \
bindings/js/PausedTimeouts.cpp \
bindings/js/ScheduledAction.cpp \
css/CSSBorderImageValue.cpp \
......
......@@ -580,6 +580,10 @@
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSDOMWindow.h"
>
</File>
<File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSDOMWindowBase.lut.h"
>
</File>
<File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\JSElement.cpp"
>
......@@ -2524,10 +2528,6 @@
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\kjs_navigator.lut.h"
>
</File>
<File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\kjs_window.lut.h"
>
</File>
<File
RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\SVGElementFactory.cpp"
>
......@@ -7643,6 +7643,14 @@
RelativePath="..\bindings\js\JSDocumentCustom.cpp"
>
</File>
<File
RelativePath="..\bindings\js\JSDOMWindowBase.cpp"
>
</File>
<File
RelativePath="..\bindings\js\JSDOMWindowBase.h"
>
</File>
<File
RelativePath="..\bindings\js\JSDOMWindowCustom.cpp"
>
......@@ -7931,14 +7939,6 @@
RelativePath="..\bindings\js\kjs_proxy.h"
>
</File>
<File
RelativePath="..\bindings\js\kjs_window.cpp"
>
</File>
<File
RelativePath="..\bindings\js\kjs_window.h"
>
</File>
<File
RelativePath="..\bindings\js\PausedTimeouts.cpp"
>
......
......@@ -482,7 +482,6 @@
656581EE09D1508D000E61D7 /* JSXMLHttpRequest.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581D709D1508D000E61D7 /* JSXMLHttpRequest.lut.h */; };
656581F009D1508D000E61D7 /* JSXSLTProcessor.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581D909D1508D000E61D7 /* JSXSLTProcessor.lut.h */; };
656581F509D1508D000E61D7 /* kjs_navigator.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581DE09D1508D000E61D7 /* kjs_navigator.lut.h */; };
656581F809D1508D000E61D7 /* kjs_window.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581E109D1508D000E61D7 /* kjs_window.lut.h */; };
656581FE09D1508D000E61D7 /* SVGElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581E709D1508D000E61D7 /* SVGElementFactory.h */; };
6565820009D1508D000E61D7 /* SVGNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581E909D1508D000E61D7 /* SVGNames.h */; };
6565820209D1508D000E61D7 /* XLinkNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 656581EB09D1508D000E61D7 /* XLinkNames.h */; };
......@@ -1599,8 +1598,6 @@
93B70D6E09EB0C7C009D8468 /* kjs_navigator.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5209EB0C7C009D8468 /* kjs_navigator.h */; };
93B70D6F09EB0C7C009D8468 /* kjs_proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */; };
93B70D7009EB0C7C009D8468 /* kjs_proxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5409EB0C7C009D8468 /* kjs_proxy.h */; settings = {ATTRIBUTES = (Private, ); }; };
93B70D7509EB0C7C009D8468 /* kjs_window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D5909EB0C7C009D8468 /* kjs_window.cpp */; };
93B70D7609EB0C7C009D8468 /* kjs_window.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5A09EB0C7C009D8468 /* kjs_window.h */; settings = {ATTRIBUTES = (Private, ); }; };
93B77A380ADD792500EA4B81 /* FrameLoaderTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B77A370ADD792500EA4B81 /* FrameLoaderTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
93B780CA09B3B7FE00690162 /* WidgetClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B780C909B3B7FE00690162 /* WidgetClient.h */; };
93C09A530B064DB3005ABD4D /* EventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C09A520B064DB3005ABD4D /* EventHandler.h */; settings = {ATTRIBUTES = (Private, ); }; };
......@@ -3510,6 +3507,8 @@
BC64B4DA0CB4298A005F2B62 /* CSSFontFaceSrcValue.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64B4D20CB4298A005F2B62 /* CSSFontFaceSrcValue.h */; };
BC64B4DB0CB4298A005F2B62 /* CSSFontSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64B4D30CB4298A005F2B62 /* CSSFontSelector.cpp */; };
BC64B4DC0CB4298A005F2B62 /* CSSFontSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64B4D40CB4298A005F2B62 /* CSSFontSelector.h */; };
BC6932730D7E293900AE44D1 /* JSDOMWindowBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */; };
BC6932740D7E293900AE44D1 /* JSDOMWindowBase.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC6C49F30D7DBA0500FFA558 /* JSImageConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6C49F10D7DBA0500FFA558 /* JSImageConstructor.cpp */; };
BC6C49F40D7DBA0500FFA558 /* JSImageConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6C49F20D7DBA0500FFA558 /* JSImageConstructor.h */; };
BC6D44BE0C07EFB60072D2C9 /* JSHTMLEmbedElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC6D44BD0C07EFB60072D2C9 /* JSHTMLEmbedElementCustom.cpp */; };
......@@ -4772,7 +4771,6 @@
656581D709D1508D000E61D7 /* JSXMLHttpRequest.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXMLHttpRequest.lut.h; sourceTree = "<group>"; };
656581D909D1508D000E61D7 /* JSXSLTProcessor.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXSLTProcessor.lut.h; sourceTree = "<group>"; };
656581DE09D1508D000E61D7 /* kjs_navigator.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_navigator.lut.h; sourceTree = "<group>"; };
656581E109D1508D000E61D7 /* kjs_window.lut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_window.lut.h; sourceTree = "<group>"; };
656581E609D1508D000E61D7 /* SVGElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGElementFactory.cpp; sourceTree = "<group>"; };
656581E709D1508D000E61D7 /* SVGElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGElementFactory.h; sourceTree = "<group>"; };
656581E809D1508D000E61D7 /* SVGNames.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGNames.cpp; sourceTree = "<group>"; };
......@@ -5841,8 +5839,6 @@
93B70D5209EB0C7C009D8468 /* kjs_navigator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_navigator.h; sourceTree = "<group>"; };
93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_proxy.cpp; sourceTree = "<group>"; };
93B70D5409EB0C7C009D8468 /* kjs_proxy.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_proxy.h; sourceTree = "<group>"; };
93B70D5909EB0C7C009D8468 /* kjs_window.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_window.cpp; sourceTree = "<group>"; };
93B70D5A09EB0C7C009D8468 /* kjs_window.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_window.h; sourceTree = "<group>"; };
93B77A370ADD792500EA4B81 /* FrameLoaderTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameLoaderTypes.h; sourceTree = "<group>"; };
93B780C909B3B7FE00690162 /* WidgetClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WidgetClient.h; sourceTree = "<group>"; };
93C09A520B064DB3005ABD4D /* EventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventHandler.h; sourceTree = "<group>"; };
......@@ -7617,6 +7613,8 @@
BC64B4D20CB4298A005F2B62 /* CSSFontFaceSrcValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontFaceSrcValue.h; sourceTree = "<group>"; };
BC64B4D30CB4298A005F2B62 /* CSSFontSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontSelector.cpp; sourceTree = "<group>"; };
BC64B4D40CB4298A005F2B62 /* CSSFontSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontSelector.h; sourceTree = "<group>"; };
BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMWindowBase.cpp; sourceTree = "<group>"; };
BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMWindowBase.h; sourceTree = "<group>"; };
BC6C49F10D7DBA0500FFA558 /* JSImageConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSImageConstructor.cpp; sourceTree = "<group>"; };
BC6C49F20D7DBA0500FFA558 /* JSImageConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSImageConstructor.h; sourceTree = "<group>"; };
BC6D44BD0C07EFB60072D2C9 /* JSHTMLEmbedElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLEmbedElementCustom.cpp; sourceTree = "<group>"; };
......@@ -8253,7 +8251,6 @@
A8D06B380A265DCD005E7203 /* HTMLNames.cpp */,
A8D06B370A265DCD005E7203 /* HTMLNames.h */,
656581DE09D1508D000E61D7 /* kjs_navigator.lut.h */,
656581E109D1508D000E61D7 /* kjs_window.lut.h */,
656581E609D1508D000E61D7 /* SVGElementFactory.cpp */,
656581E709D1508D000E61D7 /* SVGElementFactory.h */,
656581E809D1508D000E61D7 /* SVGNames.cpp */,
......@@ -8516,7 +8513,6 @@
854F12AC0A8EBC18000940B5 /* Core */ = {
isa = PBXGroup;
children = (
858C39510AA9024C00B187A4 /* CSS */,
856C8AE20A912649005C687B /* DOMObject.h */,
856C8AE30A912649005C687B /* DOMObject.mm */,
93C841FE09CE858300DFF5E5 /* DOMImplementationFront.cpp */,
......@@ -11445,6 +11441,8 @@
E4EEFFC70D34550C00469A58 /* JSAudioConstructor.h */,
E10B93C20B73C291003ED890 /* JSCustomXPathNSResolver.cpp */,
E10B937B0B73C00A003ED890 /* JSCustomXPathNSResolver.h */,
BC6932710D7E293900AE44D1 /* JSDOMWindowBase.cpp */,
BC6932720D7E293900AE44D1 /* JSDOMWindowBase.h */,
B25BE50E0D06B70800B524C6 /* JSEventTargetBase.cpp */,
B25BE50F0D06B70800B524C6 /* JSEventTargetBase.h */,
BCD9C26A0C17AA81005C90A2 /* JSEventTargetNode.cpp */,
......@@ -11485,8 +11483,6 @@
93B70D5209EB0C7C009D8468 /* kjs_navigator.h */,
93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */,
93B70D5409EB0C7C009D8468 /* kjs_proxy.h */,
93B70D5909EB0C7C009D8468 /* kjs_window.cpp */,
93B70D5A09EB0C7C009D8468 /* kjs_window.h */,
BCA378140D15C64600B793D6 /* PausedTimeouts.cpp */,
BCA378150D15C64600B793D6 /* PausedTimeouts.h */,
BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */,
......@@ -11500,6 +11496,7 @@
children = (
85B232260A8BF3A100FDF47B /* Derived Sources */,
854F12AC0A8EBC18000940B5 /* Core */,
858C39510AA9024C00B187A4 /* CSS */,
8549492D0AC85A0A008AB035 /* SVG */,
854075420AD6C73E00620C57 /* DOMExceptions */,
859B7FB90A8D288800A5F1EA /* CodeGeneratorObjC.pm */,
......@@ -14178,8 +14175,6 @@
93B70D6E09EB0C7C009D8468 /* kjs_navigator.h in Headers */,
656581F509D1508D000E61D7 /* kjs_navigator.lut.h in Headers */,
93B70D7009EB0C7C009D8468 /* kjs_proxy.h in Headers */,
93B70D7609EB0C7C009D8468 /* kjs_window.h in Headers */,
656581F809D1508D000E61D7 /* kjs_window.lut.h in Headers */,
BCB16C2D0979C3BD00467741 /* loader.h in Headers */,
93309DF8099E64920056E581 /* markup.h in Headers */,
93309E1E099E64920056E581 /* visible_units.h in Headers */,
......@@ -14250,6 +14245,7 @@
BC6C49F40D7DBA0500FFA558 /* JSImageConstructor.h in Headers */,
BC3452440D7E00EA0016574A /* JSRGBColor.h in Headers */,
BC3452560D7E02850016574A /* JSRGBColor.lut.h in Headers */,
BC6932740D7E293900AE44D1 /* JSDOMWindowBase.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -15791,7 +15787,6 @@
93B70D6B09EB0C7C009D8468 /* kjs_html.cpp in Sources */,
93B70D6D09EB0C7C009D8468 /* kjs_navigator.cpp in Sources */,
93B70D6F09EB0C7C009D8468 /* kjs_proxy.cpp in Sources */,
93B70D7509EB0C7C009D8468 /* kjs_window.cpp in Sources */,
BCB16C2C0979C3BD00467741 /* loader.cpp in Sources */,
93309DF7099E64920056E581 /* markup.cpp in Sources */,
93309E1D099E64920056E581 /* visible_units.cpp in Sources */,
......@@ -15852,6 +15847,7 @@
1C26497A0D7E248A00BD10F2 /* DocumentLoaderMac.cpp in Sources */,
1C26497C0D7E24EC00BD10F2 /* PageMac.cpp in Sources */,
BC3452430D7E00EA0016574A /* JSRGBColor.cpp in Sources */,
BC6932730D7E293900AE44D1 /* JSDOMWindowBase.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -50,6 +50,7 @@ This file contains the list of files needed to build WebCore.
bindings/js/JSCustomVoidCallback.cpp
bindings/js/JSCustomXPathNSResolver.cpp
bindings/js/JSDatabaseCustom.cpp
bindings/js/JSDOMWindowBase.cpp
bindings/js/JSDOMWindowCustom.cpp
bindings/js/JSDocumentCustom.cpp
bindings/js/JSElementCustom.cpp
......@@ -94,7 +95,6 @@ This file contains the list of files needed to build WebCore.
bindings/js/kjs_html.cpp
bindings/js/kjs_navigator.cpp
bindings/js/kjs_proxy.cpp
bindings/js/kjs_window.cpp
bindings/js/PausedTimeouts.cpp
bindings/js/ScheduledAction.cpp
</set>
......
......@@ -36,7 +36,6 @@
#include "Page.h"
#include "kjs_binding.h"
#include "kjs_proxy.h"
#include "kjs_window.h"
namespace WebCore {
......
......@@ -37,7 +37,6 @@
#include "Page.h"
#include "kjs_binding.h"
#include "kjs_proxy.h"
#include "kjs_window.h"
namespace WebCore {
......
......@@ -21,7 +21,7 @@
*/
#include "config.h"
#include "kjs_window.h"
#include "JSDOMWindowBase.h"
#include "Base64.h"
#include "CString.h"
......@@ -69,7 +69,7 @@
#include "JSXSLTProcessor.h"
#endif
#include "kjs_window.lut.h"
#include "JSDOMWindowBase.lut.h"
using namespace KJS;
......
......@@ -17,15 +17,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef kjs_window_h
#define kjs_window_h
#ifndef JSDOMWindowBase_h
#define JSDOMWindowBase_h
#include "PlatformString.h"
#include "SecurityOrigin.h"
#include "kjs_binding.h"
#include <kjs/protect.h>
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
#include <wtf/OwnPtr.h>
namespace WebCore {
......@@ -178,4 +177,4 @@ namespace WebCore {
} // namespace WebCore
#endif // kjs_window_h
#endif // JSDOMWindowBase_h
......@@ -27,7 +27,6 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "FrameTree.h"
#include "kjs_window.h"
#include <kjs/object.h>
using namespace KJS;
......
......@@ -39,7 +39,6 @@
#include "JSDOMWindow.h"
#include "PlatformString.h"
#include "SQLValue.h"
#include "kjs_window.h"
#include <kjs/array_instance.h>
namespace WebCore {
......
......@@ -29,7 +29,6 @@
#include "JSDOMWindow.h"
#include "JSEventTargetNode.h"
#include "kjs_window.h"
#if ENABLE(SVG)
#include "JSSVGElementInstance.h"
......
......@@ -32,7 +32,6 @@
#include "EventNames.h"
#include "JSEvent.h"
#include "kjs_events.h"
#include "kjs_window.h"
namespace KJS {
......
......@@ -28,7 +28,6 @@
#include "JSEventTargetNode.h"
#include "JSDOMWindow.h"
#include "kjs_window.h"
namespace WebCore {
......
......@@ -36,11 +36,11 @@
#include "JSDOMWindow.h"
#include "JSHTMLCollection.h"
#include "kjs_html.h"
#include "kjs_window.h"
using namespace KJS;
namespace WebCore {
using namespace KJS;
using namespace HTMLNames;
bool JSHTMLDocument::canGetItemsForName(ExecState*, HTMLDocument* doc, const Identifier& propertyName)
......
......@@ -32,7 +32,6 @@
#include "HTMLNames.h"
#include "JSDOMWindow.h"
#include "kjs_binding.h"
#include "kjs_window.h"
namespace WebCore {
......
......@@ -31,7 +31,6 @@
#include "Frame.h"
#include "History.h"
#include "kjs_window.h"
using namespace KJS;
......
......@@ -28,7 +28,6 @@
#include "FrameLoader.h"
#include "JSDOMWindow.h"
#include "kjs_proxy.h"
#include "kjs_window.h"
#include "JSLocation.lut.h"
......
......@@ -35,7 +35,6 @@
#include "JSCustomSQLStatementErrorCallback.h"
#include "JSDOMWindow.h"
#include "SQLTransaction.h"
#include "kjs_window.h"
using namespace KJS;
......
......@@ -30,7 +30,6 @@
#include "JSEvent.h"
#include "XMLHttpRequest.h"
#include "kjs_events.h"
#include "kjs_window.h"
using namespace KJS;
using namespace WebCore;
......
......@@ -32,7 +32,6 @@
#include "JSDOMWindow.h"
#include "Page.h"
#include "kjs_proxy.h"
#include "kjs_window.h"
using namespace KJS;
......
......@@ -41,7 +41,6 @@
#include "KURL.h"
#include "RangeException.h"
#include "XMLHttpRequestException.h"
#include "kjs_window.h"
#if ENABLE(SVG)
#include "JSSVGException.h"
......
......@@ -33,7 +33,6 @@
#include "JSEventTargetNode.h"
#include "Page.h"
#include "kjs_proxy.h"
#include "kjs_window.h"
#include <kjs/function_object.h>
using namespace KJS;
......
......@@ -33,7 +33,6 @@
#include "Page.h"
#include "PluginInfoStore.h"
#include "Settings.h"
#include "kjs_window.h"
#include <kjs/object_object.h>
#ifndef WEBCORE_NAVIGATOR_PLATFORM
......
......@@ -33,7 +33,6 @@
#include "Page.h"
#include "Settings.h"
#include "kjs_events.h"
#include "kjs_window.h"
#include <kjs/debugger.h>
#if ENABLE(SVG)
......
......@@ -120,16 +120,6 @@ sub GetParentClassName
return "JS" . $codeGenerator->StripModule($dataNode->parents(0));
}
sub GetLegacyHeaderIncludes
{
my $legacyParent = shift;
return "#include \"JSHTMLInputElementBase.h\"\n\n" if $legacyParent eq "JSHTMLInputElementBase";
return "#include \"kjs_window.h\"\n\n" if $legacyParent eq "JSDOMWindowBase";
die "Don't know what headers to include for legacy parent $legacyParent";
}
sub GetVisibleClassName
{
my $className = shift;
......@@ -288,16 +278,12 @@ sub GenerateHeader
push(@headerContent, "\n#if ${conditionalString}\n\n");
}
if (exists $dataNode->extendedAttributes->{"LegacyParent"}) {
push(@headerContent, GetLegacyHeaderIncludes($dataNode->extendedAttributes->{"LegacyParent"}));
if ($hasParent) {
push(@headerContent, "#include \"$parentClassName.h\"\n");
} else {
if ($hasParent) {
push(@headerContent, "#include \"$parentClassName.h\"\n");
} else {
push(@headerContent, "#include \"kjs_binding.h\"\n");
push(@headerContent, "#include <kjs/JSGlobalObject.h>\n");
push(@headerContent, "#include <kjs/object_object.h>\n");
}
push(@headerContent, "#include \"kjs_binding.h\"\n");
push(@headerContent, "#include <kjs/JSGlobalObject.h>\n");
push(@headerContent, "#include <kjs/object_object.h>\n");
}
# Get correct pass/store types respecting PODType flag
......@@ -1552,8 +1538,6 @@ sub NativeToJSValue
if ($type eq "EventTarget") {
$implIncludes{"EventTargetNode.h"} = 1;
$implIncludes{"JSEventTargetNode.h"} = 1;
} elsif ($type eq "DOMWindow") {
$implIncludes{"kjs_window.h"} = 1;
} elsif ($type eq "DOMObject") {
$implIncludes{"JSCanvasRenderingContext2D.h"} = 1;
} elsif ($type =~ /SVGPathSeg/) {
......
......@@ -44,7 +44,6 @@
#include "PausedTimeouts.h"
#include "SystemTime.h"
#include "kjs_proxy.h"
#include "kjs_window.h"
#include <kjs/JSLock.h>
#include <kjs/SavedBuiltins.h>
#include <kjs/property_map.h>
......
......@@ -82,7 +82,6 @@
#include "XMLTokenizer.h"
#include "kjs_binding.h"
#include "kjs_proxy.h"
#include "kjs_window.h"
#include <kjs/JSLock.h>
#include <kjs/object.h>
......
......@@ -38,7 +38,6 @@
#include "SecurityOrigin.h"
#include "Settings.h"
#include "WindowFeatures.h"
#include "kjs_window.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
......
......@@ -57,7 +57,6 @@
#include "TextEncoding.h"
#include "TextIterator.h"
#include "kjs_proxy.h"
#include "kjs_window.h"
#include <JavaScriptCore/APICast.h>
#include <JavaScriptCore/JSLock.h>
#include <JavaScriptCore/JSRetainPtr.h>
......
......@@ -88,7 +88,6 @@
#import "WebDashboardRegion.h"
#import "WebScriptObjectPrivate.h"
#import "kjs_proxy.h"
#import "kjs_window.h"
#import "visible_units.h"
#import <Carbon/Carbon.h>
#import <JavaScriptCore/APICast.h>
......
......@@ -86,7 +86,6 @@
#import "XMLTokenizer.h"
#import "htmlediting.h"
#import "kjs_proxy.h"
#import "kjs_window.h"
#import "markup.h"
#import "visible_units.h"
#import <JavaScriptCore/array_instance.h>
......
......@@ -63,9 +63,9 @@
#include "kjs_proxy.h"
#include "TypingCommand.h"
#include "JSLock.h"
#include "kjs_window.h"
#include "runtime_root.h"
#include "runtime.h"
#include "JSDOMWindow"
#include <QScrollArea>
#include "NotImplemented.h"
......