WebCore:

2008-06-14  Darin Adler  <darin@apple.com>

        Rubber stamped by Sam.

        - new names for kjs_binding.h and kjs_proxy.h

        * GNUmakefile.am:
        * WebCore.pro:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * WebCoreSources.bkl:
        * bindings/js/JSAudioConstructor.h:
        * bindings/js/JSCustomSQLStatementCallback.cpp:
        * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
        * bindings/js/JSCustomSQLTransactionCallback.cpp:
        * bindings/js/JSCustomSQLTransactionErrorCallback.cpp:
        * bindings/js/JSCustomVoidCallback.cpp:
        * bindings/js/JSCustomXPathNSResolver.cpp:
        * bindings/js/JSDOMBinding.cpp: Copied from WebCore/bindings/js/kjs_binding.cpp.
        * bindings/js/JSDOMBinding.h: Copied from WebCore/bindings/js/kjs_binding.h.
        * bindings/js/JSDOMWindowBase.cpp:
        * bindings/js/JSDOMWindowBase.h:
        * bindings/js/JSDOMWindowCustom.cpp:
        * bindings/js/JSDOMWindowShell.cpp:
        * bindings/js/JSDOMWindowShell.h:
        * bindings/js/JSDocumentCustom.cpp:
        * bindings/js/JSHTMLCollectionCustom.cpp:
        * bindings/js/JSHTMLFrameElementCustom.cpp:
        * bindings/js/JSHTMLFrameSetElementCustom.cpp:
        * bindings/js/JSHTMLIFrameElementCustom.cpp:
        * bindings/js/JSHTMLInputElementBase.h:
        * bindings/js/JSHTMLOptionElementConstructor.h:
        * bindings/js/JSImageConstructor.h:
        * bindings/js/JSLocationCustom.cpp:
        * bindings/js/JSNamedNodeMapCustom.cpp:
        * bindings/js/JSNamedNodesCollection.h:
        * bindings/js/JSNodeFilterCondition.cpp:
        * bindings/js/JSNodeFilterCustom.cpp:
        * bindings/js/JSRGBColor.h:
        * bindings/js/JSSVGPathSegCustom.cpp:
        * bindings/js/JSXMLHttpRequestConstructor.h:
        * bindings/js/JSXSLTProcessorConstructor.h:
        * bindings/js/JSXSLTProcessorCustom.cpp:
        * bindings/js/ScheduledAction.cpp:
        (WebCore::ScheduledAction::execute):
        * bindings/js/ScriptController.cpp: Copied from WebCore/bindings/js/kjs_proxy.cpp.
        * bindings/js/ScriptController.h: Copied from WebCore/bindings/js/kjs_proxy.h.
        * bindings/js/kjs_binding.cpp: Removed.
        * bindings/js/kjs_binding.h: Removed.
        * bindings/js/kjs_events.cpp:
        (WebCore::JSAbstractEventListener::handleEvent):
        * bindings/js/kjs_html.cpp:
        * bindings/js/kjs_html.h:
        * bindings/js/kjs_proxy.cpp: Removed.
        * bindings/js/kjs_proxy.h: Removed.
        * bindings/objc/DOMInternal.mm:
        * bindings/scripts/CodeGeneratorJS.pm:
        * bridge/jni/jni_jsobject.mm:
        * dom/Document.cpp:
        * dom/EventTarget.cpp:
        * dom/Node.cpp:
        * dom/XMLTokenizer.cpp:
        (WebCore::XMLTokenizer::startElementNs):
        * history/CachedPage.cpp:
        (WebCore::CachedPage::CachedPage):
        (WebCore::CachedPage::restore):
        * html/HTMLPlugInElement.cpp:
        * html/HTMLScriptElement.cpp:
        * html/HTMLTokenizer.cpp:
        (WebCore::HTMLTokenizer::processToken):
        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::executeScript):
        * page/Frame.cpp:
        (WebCore::Frame::scriptProxy):
        * page/Frame.h:
        * page/FramePrivate.h:
        * page/InspectorController.cpp:
        * page/JavaScriptDebugServer.cpp:
        * page/JavaScriptProfileNode.cpp:
        * page/Page.cpp:
        * page/gtk/FrameGtk.cpp:
        * page/mac/FrameMac.mm:
        * page/qt/FrameQt.cpp:
        * page/win/FrameWin.cpp:
        * plugins/PluginView.cpp:
        (WebCore::getString):
        * plugins/gtk/PluginViewGtk.cpp:
        * plugins/qt/PluginViewQt.cpp:
        * plugins/win/PluginViewWin.cpp:
        * svg/SVGDocumentExtensions.cpp:
        * xml/XMLHttpRequest.cpp:

WebKit/gtk:

2008-06-14  Darin Adler  <darin@apple.com>

        Rubber stamped by Sam.

        - new names for kjs_binding.h and kjs_proxy.h

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

WebKit/mac:

2008-06-14  Darin Adler  <darin@apple.com>

        Rubber stamped by Sam.

        - new names for kjs_binding.h and kjs_proxy.h

        * WebView/WebFrame.mm:
        * WebView/WebScriptDebugDelegate.mm:
        * WebView/WebView.mm:

WebKit/qt:

2008-06-14  Darin Adler  <darin@apple.com>

        Rubber stamped by Sam.

        - new names for kjs_binding.h and kjs_proxy.h

        * Api/qwebframe.cpp:
        (QWebFrame::evaluateJavaScript):
        * WebKit_pch.h:

WebKit/win:

2008-06-14  Darin Adler  <darin@apple.com>

        Rubber stamped by Sam.

        - new names for kjs_binding.h and kjs_proxy.h

        * WebFrame.cpp:

WebKit/wx:

2008-06-14  Darin Adler  <darin@apple.com>

        Rubber stamped by Sam.

        - new names for kjs_binding.h and kjs_proxy.h

        * WebView.cpp:

WebKitTools:

2008-06-14  Darin Adler  <darin@apple.com>

        * Scripts/do-webcore-rename: Moved planned renames into a separate hash
        from the actual renames. Removed many renames that are either done or
        no longer planned.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 05d4057e8b8db10af6f6860c6d1177a7c9d336ba..6e91ec91bbda265337b8646a13e2e5697c71f6e0 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,95 @@
+2008-06-14  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Sam.
+
+        - new names for kjs_binding.h and kjs_proxy.h
+
+        * GNUmakefile.am:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * WebCoreSources.bkl:
+        * bindings/js/JSAudioConstructor.h:
+        * bindings/js/JSCustomSQLStatementCallback.cpp:
+        * bindings/js/JSCustomSQLStatementErrorCallback.cpp:
+        * bindings/js/JSCustomSQLTransactionCallback.cpp:
+        * bindings/js/JSCustomSQLTransactionErrorCallback.cpp:
+        * bindings/js/JSCustomVoidCallback.cpp:
+        * bindings/js/JSCustomXPathNSResolver.cpp:
+        * bindings/js/JSDOMBinding.cpp: Copied from WebCore/bindings/js/kjs_binding.cpp.
+        * bindings/js/JSDOMBinding.h: Copied from WebCore/bindings/js/kjs_binding.h.
+        * bindings/js/JSDOMWindowBase.cpp:
+        * bindings/js/JSDOMWindowBase.h:
+        * bindings/js/JSDOMWindowCustom.cpp:
+        * bindings/js/JSDOMWindowShell.cpp:
+        * bindings/js/JSDOMWindowShell.h:
+        * bindings/js/JSDocumentCustom.cpp:
+        * bindings/js/JSHTMLCollectionCustom.cpp:
+        * bindings/js/JSHTMLFrameElementCustom.cpp:
+        * bindings/js/JSHTMLFrameSetElementCustom.cpp:
+        * bindings/js/JSHTMLIFrameElementCustom.cpp:
+        * bindings/js/JSHTMLInputElementBase.h:
+        * bindings/js/JSHTMLOptionElementConstructor.h:
+        * bindings/js/JSImageConstructor.h:
+        * bindings/js/JSLocationCustom.cpp:
+        * bindings/js/JSNamedNodeMapCustom.cpp:
+        * bindings/js/JSNamedNodesCollection.h:
+        * bindings/js/JSNodeFilterCondition.cpp:
+        * bindings/js/JSNodeFilterCustom.cpp:
+        * bindings/js/JSRGBColor.h:
+        * bindings/js/JSSVGPathSegCustom.cpp:
+        * bindings/js/JSXMLHttpRequestConstructor.h:
+        * bindings/js/JSXSLTProcessorConstructor.h:
+        * bindings/js/JSXSLTProcessorCustom.cpp:
+        * bindings/js/ScheduledAction.cpp:
+        (WebCore::ScheduledAction::execute):
+        * bindings/js/ScriptController.cpp: Copied from WebCore/bindings/js/kjs_proxy.cpp.
+        * bindings/js/ScriptController.h: Copied from WebCore/bindings/js/kjs_proxy.h.
+        * bindings/js/kjs_binding.cpp: Removed.
+        * bindings/js/kjs_binding.h: Removed.
+        * bindings/js/kjs_events.cpp:
+        (WebCore::JSAbstractEventListener::handleEvent):
+        * bindings/js/kjs_html.cpp:
+        * bindings/js/kjs_html.h:
+        * bindings/js/kjs_proxy.cpp: Removed.
+        * bindings/js/kjs_proxy.h: Removed.
+        * bindings/objc/DOMInternal.mm:
+        * bindings/scripts/CodeGeneratorJS.pm:
+        * bridge/jni/jni_jsobject.mm:
+        * dom/Document.cpp:
+        * dom/EventTarget.cpp:
+        * dom/Node.cpp:
+        * dom/XMLTokenizer.cpp:
+        (WebCore::XMLTokenizer::startElementNs):
+        * history/CachedPage.cpp:
+        (WebCore::CachedPage::CachedPage):
+        (WebCore::CachedPage::restore):
+        * html/HTMLPlugInElement.cpp:
+        * html/HTMLScriptElement.cpp:
+        * html/HTMLTokenizer.cpp:
+        (WebCore::HTMLTokenizer::processToken):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::executeScript):
+        * page/Frame.cpp:
+        (WebCore::Frame::scriptProxy):
+        * page/Frame.h:
+        * page/FramePrivate.h:
+        * page/InspectorController.cpp:
+        * page/JavaScriptDebugServer.cpp:
+        * page/JavaScriptProfileNode.cpp:
+        * page/Page.cpp:
+        * page/gtk/FrameGtk.cpp:
+        * page/mac/FrameMac.mm:
+        * page/qt/FrameQt.cpp:
+        * page/win/FrameWin.cpp:
+        * plugins/PluginView.cpp:
+        (WebCore::getString):
+        * plugins/gtk/PluginViewGtk.cpp:
+        * plugins/qt/PluginViewQt.cpp:
+        * plugins/win/PluginViewWin.cpp:
+        * svg/SVGDocumentExtensions.cpp:
+        * xml/XMLHttpRequest.cpp:
+
 2008-06-14  Darin Adler  <darin@apple.com>
 
         Rubber stamped by Sam.

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 9dbedb19fa2a2860592aa621c19a37995058633a..65bce1652c07c37400eaa1038846c66c0663c115 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -544,10 +544,10 @@ webcore_sources += \
        WebCore/bindings/js/JSXMLHttpRequestConstructor.cpp \
        WebCore/bindings/js/JSXSLTProcessorCustom.cpp \
        WebCore/bindings/js/JSXSLTProcessorConstructor.cpp \
-       WebCore/bindings/js/kjs_binding.cpp \
+       WebCore/bindings/js/JSDOMBinding.cpp \
        WebCore/bindings/js/kjs_events.cpp \
        WebCore/bindings/js/kjs_html.cpp \
-       WebCore/bindings/js/kjs_proxy.cpp \
+       WebCore/bindings/js/ScriptController.cpp \
        WebCore/bindings/js/PausedTimeouts.cpp \
        WebCore/bindings/js/ScheduledAction.cpp \
        WebCore/bridge/NP_jsobject.cpp \

diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 86c46659ae71dc4766a2eae4071c05464e6a2348..0e8aa8c3c54e26954505188afbfbec4fd6d88a61 100644 (file)
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -424,10 +424,10 @@ SOURCES += \
     bindings/js/JSPluginCustom.cpp \
     bindings/js/JSPluginArrayCustom.cpp \
     bindings/js/JSMimeTypeArrayCustom.cpp \
-    bindings/js/kjs_binding.cpp \
+    bindings/js/JSDOMBinding.cpp \
     bindings/js/kjs_events.cpp \
     bindings/js/kjs_html.cpp \
-    bindings/js/kjs_proxy.cpp \
+    bindings/js/ScriptController.cpp \
     bindings/js/PausedTimeouts.cpp \
     bindings/js/ScheduledAction.cpp \
     bridge/NP_jsobject.cpp \

diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index e20214b1a24ebdc568023b0bf155c18800c6b2ff..b2597f273a9bc499e98a6a5422b46edb76bfd8ca 100644 (file)
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -13919,11 +13919,11 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\bindings\js\kjs_binding.cpp"\r
+                                       RelativePath="..\bindings\js\JSDOMBinding.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\bindings\js\kjs_binding.h"\r
+                                       RelativePath="..\bindings\js\JSDOMBinding.h"\r
                                        >\r
                                </File>\r
                                <File\r
@@ -13943,11 +13943,11 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\bindings\js\kjs_proxy.cpp"\r
+                                       RelativePath="..\bindings\js\ScriptController.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\bindings\js\kjs_proxy.h"\r
+                                       RelativePath="..\bindings\js\ScriptController.h"\r
                                        >\r
                                </File>\r
                                <File\r

diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 3d1c0496db856d436e0a5f07d5200eedc5987858..08293b496bf163bd8ce9b3355ef55af350a0b0c9 100644 (file)
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1712,14 +1712,14 @@
                93B6A0E60B0BCA5C00F5027A /* ContextMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93B6A0E80B0BCA6700F5027A /* ContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B6A0E70B0BCA6700F5027A /* ContextMenu.cpp */; };
                93B6A0EA0B0BCA8400F5027A /* ContextMenuMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */; };
-               93B70D6309EB0C7C009D8468 /* kjs_binding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D4709EB0C7C009D8468 /* kjs_binding.cpp */; };
-               93B70D6409EB0C7C009D8468 /* kjs_binding.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D4809EB0C7C009D8468 /* kjs_binding.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               93B70D6309EB0C7C009D8468 /* JSDOMBinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */; };
+               93B70D6409EB0C7C009D8468 /* JSDOMBinding.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */; settings = {ATTRIBUTES = (Private, ); }; };
                93B70D6909EB0C7C009D8468 /* kjs_events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D4D09EB0C7C009D8468 /* kjs_events.cpp */; };
                93B70D6A09EB0C7C009D8468 /* kjs_events.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D4E09EB0C7C009D8468 /* kjs_events.h */; };
                93B70D6B09EB0C7C009D8468 /* kjs_html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D4F09EB0C7C009D8468 /* kjs_html.cpp */; };
                93B70D6C09EB0C7C009D8468 /* kjs_html.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5009EB0C7C009D8468 /* kjs_html.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, ); }; };
+               93B70D6F09EB0C7C009D8468 /* ScriptController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93B70D5309EB0C7C009D8468 /* ScriptController.cpp */; };
+               93B70D7009EB0C7C009D8468 /* ScriptController.h in Headers */ = {isa = PBXBuildFile; fileRef = 93B70D5409EB0C7C009D8468 /* ScriptController.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, ); }; };
@@ -6176,14 +6176,14 @@
                93B6A0E50B0BCA5C00F5027A /* ContextMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ContextMenu.h; sourceTree = "<group>"; };
                93B6A0E70B0BCA6700F5027A /* ContextMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ContextMenu.cpp; sourceTree = "<group>"; };
                93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextMenuMac.mm; sourceTree = "<group>"; };
-               93B70D4709EB0C7C009D8468 /* kjs_binding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_binding.cpp; sourceTree = "<group>"; };
-               93B70D4809EB0C7C009D8468 /* kjs_binding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_binding.h; sourceTree = "<group>"; };
+               93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMBinding.cpp; sourceTree = "<group>"; };
+               93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMBinding.h; sourceTree = "<group>"; };
                93B70D4D09EB0C7C009D8468 /* kjs_events.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_events.cpp; sourceTree = "<group>"; };
                93B70D4E09EB0C7C009D8468 /* kjs_events.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_events.h; sourceTree = "<group>"; };
                93B70D4F09EB0C7C009D8468 /* kjs_html.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kjs_html.cpp; sourceTree = "<group>"; };
                93B70D5009EB0C7C009D8468 /* kjs_html.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = kjs_html.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>"; };
+               93B70D5309EB0C7C009D8468 /* ScriptController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptController.cpp; sourceTree = "<group>"; };
+               93B70D5409EB0C7C009D8468 /* ScriptController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ScriptController.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>"; };
@@ -12189,14 +12189,14 @@
                                BC348BE80DB80354004ABAB9 /* JSXMLHttpRequestConstructor.h */,
                                BCE99EC10DCA624100182683 /* JSXSLTProcessorConstructor.cpp */,
                                BCE99EC20DCA624100182683 /* JSXSLTProcessorConstructor.h */,
-                               93B70D4709EB0C7C009D8468 /* kjs_binding.cpp */,
-                               93B70D4809EB0C7C009D8468 /* kjs_binding.h */,
+                               93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */,
+                               93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */,
                                93B70D4D09EB0C7C009D8468 /* kjs_events.cpp */,
                                93B70D4E09EB0C7C009D8468 /* kjs_events.h */,
                                93B70D4F09EB0C7C009D8468 /* kjs_html.cpp */,
                                93B70D5009EB0C7C009D8468 /* kjs_html.h */,
-                               93B70D5309EB0C7C009D8468 /* kjs_proxy.cpp */,
-                               93B70D5409EB0C7C009D8468 /* kjs_proxy.h */,
+                               93B70D5309EB0C7C009D8468 /* ScriptController.cpp */,
+                               93B70D5409EB0C7C009D8468 /* ScriptController.h */,
                                BCA378140D15C64600B793D6 /* PausedTimeouts.cpp */,
                                BCA378150D15C64600B793D6 /* PausedTimeouts.h */,
                                65488D6A0DD5A83D009D83B2 /* StringSourceProvider.h */,
@@ -14952,11 +14952,11 @@
                                BCEA4855097D93020094C9E4 /* break_lines.h in Headers */,
                                65C97AF308EA908800ACD273 /* config.h in Headers */,
                                93309DE8099E64920056E581 /* htmlediting.h in Headers */,
-                               93B70D6409EB0C7C009D8468 /* kjs_binding.h in Headers */,
+                               93B70D6409EB0C7C009D8468 /* JSDOMBinding.h in Headers */,
                                93B70D6A09EB0C7C009D8468 /* kjs_events.h in Headers */,
                                93B70D6C09EB0C7C009D8468 /* kjs_html.h in Headers */,
                                656581F509D1508D000E61D7 /* kjs_navigator.lut.h in Headers */,
-                               93B70D7009EB0C7C009D8468 /* kjs_proxy.h in Headers */,
+                               93B70D7009EB0C7C009D8468 /* ScriptController.h in Headers */,
                                BCB16C2D0979C3BD00467741 /* loader.h in Headers */,
                                93309DF8099E64920056E581 /* markup.h in Headers */,
                                93309E1E099E64920056E581 /* visible_units.h in Headers */,
@@ -16683,10 +16683,10 @@
                                BCEA4852097D93020094C9E4 /* bidi.cpp in Sources */,
                                BCEA4854097D93020094C9E4 /* break_lines.cpp in Sources */,
                                93309DE7099E64920056E581 /* htmlediting.cpp in Sources */,
-                               93B70D6309EB0C7C009D8468 /* kjs_binding.cpp in Sources */,
+                               93B70D6309EB0C7C009D8468 /* JSDOMBinding.cpp in Sources */,
                                93B70D6909EB0C7C009D8468 /* kjs_events.cpp in Sources */,
                                93B70D6B09EB0C7C009D8468 /* kjs_html.cpp in Sources */,
-                               93B70D6F09EB0C7C009D8468 /* kjs_proxy.cpp in Sources */,
+                               93B70D6F09EB0C7C009D8468 /* ScriptController.cpp in Sources */,
                                BCB16C2C0979C3BD00467741 /* loader.cpp in Sources */,
                                93309DF7099E64920056E581 /* markup.cpp in Sources */,
                                93309E1D099E64920056E581 /* visible_units.cpp in Sources */,

diff --git a/WebCore/WebCoreSources.bkl b/WebCore/WebCoreSources.bkl
index e60cbb16df9ec9e3fb9e32f5181718a14d6b1f6c..a8cec389da5052f5733e791075cb30939284d9f0 100644 (file)
--- a/WebCore/WebCoreSources.bkl
+++ b/WebCore/WebCoreSources.bkl
@@ -102,10 +102,10 @@ This file contains the list of files needed to build WebCore.
         bindings/js/JSXMLHttpRequestCustom.cpp
         bindings/js/JSXSLTProcessorConstructor.cpp
         bindings/js/JSXSLTProcessorCustom.cpp
-        bindings/js/kjs_binding.cpp
+        bindings/js/JSDOMBinding.cpp
         bindings/js/kjs_events.cpp
         bindings/js/kjs_html.cpp
-        bindings/js/kjs_proxy.cpp
+        bindings/js/ScriptController.cpp
         bindings/js/PausedTimeouts.cpp
         bindings/js/ScheduledAction.cpp
     </set>

diff --git a/WebCore/bindings/js/JSAudioConstructor.h b/WebCore/bindings/js/JSAudioConstructor.h
index 232505382ad1149aadc26363747997bdec039291..01f0fa133d31d1cfc299fa70c61cae3e652cb3ca 100644 (file)
--- a/WebCore/bindings/js/JSAudioConstructor.h
+++ b/WebCore/bindings/js/JSAudioConstructor.h
@@ -28,7 +28,7 @@
 
 #if ENABLE(VIDEO)
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {

diff --git a/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp b/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp
index a9d2cf2d3086a112aed4b0f9675cb211213aa728..b188cdde8704b641d3eda8018ad6c2e495875aa4 100644 (file)
--- a/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp
+++ b/WebCore/bindings/js/JSCustomSQLStatementCallback.cpp
@@ -33,7 +33,7 @@
 #include "Console.h"
 #include "DOMWindow.h"
 #include "Frame.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "JSSQLResultSet.h"
 #include "JSSQLTransaction.h"
 

diff --git a/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp b/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
index 8fa174a37421a441bd40db842fd976c386f42dc8..1c0ae6cc6638726e646b1e0a4d9cc16a236b8b79 100644 (file)
--- a/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
+++ b/WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
@@ -33,7 +33,7 @@
 #include "Console.h"
 #include "DOMWindow.h"
 #include "Frame.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "JSSQLError.h"
 #include "JSSQLTransaction.h"
 

diff --git a/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp b/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp
index 7e7387947a44cb300a48dee0f5423fd02dd38050..a3961711c9a3880c4ca2dde8f93fbf6cf549bacd 100644 (file)
--- a/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp
+++ b/WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp
@@ -34,7 +34,7 @@
 #include "DOMWindow.h"
 #include "Frame.h"
 #include "Logging.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "JSSQLTransaction.h"
 #include "Page.h"
 #include <wtf/MainThread.h>

diff --git a/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp b/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp
index 63a56a2d0a7865164e154a226775f8949ef27449..6db92c06dd88176772b350e86b10b413386bf5c8 100644 (file)
--- a/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp
+++ b/WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp
@@ -33,7 +33,7 @@
 #include "Console.h"
 #include "DOMWindow.h"
 #include "Frame.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "JSSQLError.h"
 
 namespace WebCore {

diff --git a/WebCore/bindings/js/JSCustomVoidCallback.cpp b/WebCore/bindings/js/JSCustomVoidCallback.cpp
index aa5a9949aaa729db6b30e2e884349894f76a493c..8dd6ce854eefac89272c045ca9142a0120c80648 100644 (file)
--- a/WebCore/bindings/js/JSCustomVoidCallback.cpp
+++ b/WebCore/bindings/js/JSCustomVoidCallback.cpp
@@ -34,8 +34,8 @@
 #include "DOMWindow.h"
 #include "Frame.h"
 #include "JSDOMWindowCustom.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 
 namespace WebCore {
     

diff --git a/WebCore/bindings/js/JSCustomXPathNSResolver.cpp b/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
index a8e381d51e1ee17656b7912879eab6b330d1dc89..3a646284cc1637a6a6cea7c3b199885d81c6e57a 100644 (file)
--- a/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
+++ b/WebCore/bindings/js/JSCustomXPathNSResolver.cpp
@@ -35,8 +35,8 @@
 #include "ExceptionCode.h"
 #include "Frame.h"
 #include "JSDOMWindowCustom.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 
 namespace WebCore {
 

diff --git a/WebCore/bindings/js/kjs_binding.cpp b/WebCore/bindings/js/JSDOMBinding.cpp
similarity index 99%
rename from WebCore/bindings/js/kjs_binding.cpp
rename to WebCore/bindings/js/JSDOMBinding.cpp
index 14aa1d223e3af8cad45e286d0cf6c0d3fb7bdfce..93a0cef4bc5ec363f49fdd96412b7631648cc2b6 100644 (file)
--- a/WebCore/bindings/js/kjs_binding.cpp
+++ b/WebCore/bindings/js/JSDOMBinding.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #include "config.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 #include "DOMCoreException.h"
 #include "Document.h"

diff --git a/WebCore/bindings/js/kjs_binding.h b/WebCore/bindings/js/JSDOMBinding.h
similarity index 98%
rename from WebCore/bindings/js/kjs_binding.h
rename to WebCore/bindings/js/JSDOMBinding.h
index fc45a3c172c727fa6c9855700dea3e4a7fc1d978..af7bce11d2f6abbe52a1d1869d3d6aec6534d612 100644 (file)
--- a/WebCore/bindings/js/kjs_binding.h
+++ b/WebCore/bindings/js/JSDOMBinding.h
@@ -18,8 +18,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef kjs_binding_h
-#define kjs_binding_h
+#ifndef JSDOMBinding_h
+#define JSDOMBinding_h
 
 #include <kjs/function.h>
 #include <kjs/interpreter.h>
@@ -147,4 +147,4 @@ namespace WebCore {
 
 } // namespace WebCore
 
-#endif // kjs_binding_h
+#endif // JSDOMBinding_h

diff --git a/WebCore/bindings/js/JSDOMWindowBase.cpp b/WebCore/bindings/js/JSDOMWindowBase.cpp
index e19cd5bdeaf5ad18f048b0368f003adc7dcd1e78..14b076987ea3486b249b655e8e76a960e585f1d5 100644 (file)
--- a/WebCore/bindings/js/JSDOMWindowBase.cpp
+++ b/WebCore/bindings/js/JSDOMWindowBase.cpp
@@ -59,7 +59,7 @@
 #include "WindowFeatures.h"
 #include "htmlediting.h"
 #include "kjs_events.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include <wtf/AlwaysInline.h>
 #include <wtf/MathExtras.h>
 

diff --git a/WebCore/bindings/js/JSDOMWindowBase.h b/WebCore/bindings/js/JSDOMWindowBase.h
index 483b874ee75402eebfeeabcf542e05bf5bf4789b..6d24607bd214234070085ef61740532732396ec8 100644 (file)
--- a/WebCore/bindings/js/JSDOMWindowBase.h
+++ b/WebCore/bindings/js/JSDOMWindowBase.h
@@ -21,7 +21,7 @@
 #define JSDOMWindowBase_h
 
 #include "PlatformString.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include <kjs/protect.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>

diff --git a/WebCore/bindings/js/JSDOMWindowCustom.cpp b/WebCore/bindings/js/JSDOMWindowCustom.cpp
index 79b2d07f0c233d91d2646e9094067e6bac3116f7..0b41ec53346ca23acfc598cd2aa1cace26a41bf6 100644 (file)
--- a/WebCore/bindings/js/JSDOMWindowCustom.cpp
+++ b/WebCore/bindings/js/JSDOMWindowCustom.cpp
@@ -29,7 +29,7 @@
 #include "FrameTree.h"
 #include "JSDOMWindowShell.h"
 #include "Settings.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include <kjs/object.h>
 
 using namespace KJS;

diff --git a/WebCore/bindings/js/JSDOMWindowShell.cpp b/WebCore/bindings/js/JSDOMWindowShell.cpp
index 7b5c31fb672a4b00faf5422999c41c2209076f8a..510b09230b41bdaa53d75ac76d436f12790ebe98 100644 (file)
--- a/WebCore/bindings/js/JSDOMWindowShell.cpp
+++ b/WebCore/bindings/js/JSDOMWindowShell.cpp
@@ -32,7 +32,7 @@
 #include "Frame.h"
 #include "JSDOMWindow.h"
 #include "DOMWindow.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include <kjs/object.h>
 
 using namespace KJS;

diff --git a/WebCore/bindings/js/JSDOMWindowShell.h b/WebCore/bindings/js/JSDOMWindowShell.h
index 398001006256528e24b0c9d46090b7a5b21ea906..4b8115808260157684797c3a81a8f581f54fcbc1 100644 (file)
--- a/WebCore/bindings/js/JSDOMWindowShell.h
+++ b/WebCore/bindings/js/JSDOMWindowShell.h
@@ -30,7 +30,7 @@
 #define JSDOMWindowShell_h
 
 #include "JSDOMWindow.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 

diff --git a/WebCore/bindings/js/JSDocumentCustom.cpp b/WebCore/bindings/js/JSDocumentCustom.cpp
index e6dfa932fbc723dd712db53e0829766f3c4e069b..f43a535751b6b474550ce3938c4879996fe018cd 100644 (file)
--- a/WebCore/bindings/js/JSDocumentCustom.cpp
+++ b/WebCore/bindings/js/JSDocumentCustom.cpp
@@ -28,7 +28,7 @@
 #include "JSHTMLDocument.h"
 #include "JSLocation.h"
 #include "Location.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 
 #if ENABLE(SVG)
 #include "JSSVGDocument.h"

diff --git a/WebCore/bindings/js/JSHTMLCollectionCustom.cpp b/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
index 51d839a35362640cd71f69ade0afaba3b48f0112..eb274c7f75ad41813b0824972ff5cae66c26e51c 100644 (file)
--- a/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLCollectionCustom.cpp
@@ -28,7 +28,7 @@
 #include "JSNamedNodesCollection.h"
 #include "JSNode.h"
 #include "Node.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include "kjs_html.h"
 #include <wtf/Vector.h>
 

diff --git a/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp b/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp
index 9fccb44b34d8851bc36ae1d3704dc8393e980a6a..4eb946ff324471c15fc3b9c159e2cd97c06ce439 100644 (file)
--- a/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLFrameElementCustom.cpp
@@ -31,7 +31,7 @@
 
 #include "CSSHelper.h"
 #include "HTMLFrameElement.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 

diff --git a/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp b/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp
index ff2f89d50d4bd0923b71eead945addf682c89119..828b95991a129df3d4373d74b5459b52fbdaec9b 100644 (file)
--- a/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp
@@ -32,7 +32,7 @@
 #include "HTMLNames.h"
 #include "JSDOMWindow.h"
 #include "JSDOMWindowShell.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 

diff --git a/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp b/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp
index 5645ebedc372117e54ec7713708a9fada3d84c8c..8aa0b79be2c33bd396f3adbadac0453f324afdd9 100644 (file)
--- a/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp
+++ b/WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp
@@ -31,7 +31,7 @@
 
 #include "CSSHelper.h"
 #include "HTMLIFrameElement.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 

diff --git a/WebCore/bindings/js/JSHTMLInputElementBase.h b/WebCore/bindings/js/JSHTMLInputElementBase.h
index 540cb3f76f44db3ea39b2a6f3459e13fafe6533a..3f7e62e46d3a09fb719b454f25ece3deff1dab8e 100644 (file)
--- a/WebCore/bindings/js/JSHTMLInputElementBase.h
+++ b/WebCore/bindings/js/JSHTMLInputElementBase.h
@@ -21,7 +21,7 @@
 #define JSHTMLInputElementBase_h
 
 #include "JSHTMLElement.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include "kjs_html.h"
 
 namespace WebCore {

diff --git a/WebCore/bindings/js/JSHTMLOptionElementConstructor.h b/WebCore/bindings/js/JSHTMLOptionElementConstructor.h
index 426d7feb8019d864e0c52a66b58068084231adba..6b37cfb2b1d2c673bb5996168983eb3862f6f533 100644 (file)
--- a/WebCore/bindings/js/JSHTMLOptionElementConstructor.h
+++ b/WebCore/bindings/js/JSHTMLOptionElementConstructor.h
@@ -20,7 +20,7 @@
 #ifndef JSHTMLOptionElementConstructor_h
 #define JSHTMLOptionElementConstructor_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {

diff --git a/WebCore/bindings/js/JSImageConstructor.h b/WebCore/bindings/js/JSImageConstructor.h
index 6f9a65a74d84c95489339cb635c4b57edf0a7160..f170e43f406ec2290b2a63c885f1c6fa2c73c751 100644 (file)
--- a/WebCore/bindings/js/JSImageConstructor.h
+++ b/WebCore/bindings/js/JSImageConstructor.h
@@ -20,7 +20,7 @@
 #ifndef JSImageConstructor_h
 #define JSImageConstructor_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 

diff --git a/WebCore/bindings/js/JSLocationCustom.cpp b/WebCore/bindings/js/JSLocationCustom.cpp
index c8b8c2a9ae88e3a0091cb62861f75772c2b1b185..a583b685d90af5cb79772850ece903e9ff39458e 100644 (file)
--- a/WebCore/bindings/js/JSLocationCustom.cpp
+++ b/WebCore/bindings/js/JSLocationCustom.cpp
@@ -29,8 +29,8 @@
 #include "JSDOMWindowCustom.h"
 #include "KURL.h"
 #include "Location.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 
 using namespace KJS;
 

diff --git a/WebCore/bindings/js/JSNamedNodeMapCustom.cpp b/WebCore/bindings/js/JSNamedNodeMapCustom.cpp
index de1a851ed9b9f2354fb36839c4e4ab852a1b3ae8..74e35afb31d31f59f69fa88ca42481158a82b4b6 100644 (file)
--- a/WebCore/bindings/js/JSNamedNodeMapCustom.cpp
+++ b/WebCore/bindings/js/JSNamedNodeMapCustom.cpp
@@ -30,7 +30,7 @@
 #include "NamedNodeMap.h"
 #include "Node.h"
 #include "PlatformString.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 

diff --git a/WebCore/bindings/js/JSNamedNodesCollection.h b/WebCore/bindings/js/JSNamedNodesCollection.h
index d8d7a21e053c7916df7c6a670cbc87cd866d9f6f..54ccd853f52dd28d18114e3f67284fde2c046d75 100644 (file)
--- a/WebCore/bindings/js/JSNamedNodesCollection.h
+++ b/WebCore/bindings/js/JSNamedNodesCollection.h
@@ -26,7 +26,7 @@
 #ifndef JSNamedNodesCollection_h
 #define JSNamedNodesCollection_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {

diff --git a/WebCore/bindings/js/JSNodeFilterCondition.cpp b/WebCore/bindings/js/JSNodeFilterCondition.cpp
index 08f3334ee212ab3268e3de70eb5a299c10527c04..a6cf60db2d4e39c8217d1fec9d5e1101f917b25c 100644 (file)
--- a/WebCore/bindings/js/JSNodeFilterCondition.cpp
+++ b/WebCore/bindings/js/JSNodeFilterCondition.cpp
@@ -25,7 +25,7 @@
 #include "JSNode.h"
 #include "JSNodeFilter.h"
 #include "NodeFilter.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 
 namespace WebCore {
 

diff --git a/WebCore/bindings/js/JSNodeFilterCustom.cpp b/WebCore/bindings/js/JSNodeFilterCustom.cpp
index bbbe9641e4a926500fd8e16e3a517e1e1b015659..15ba5b51db923e63912cf3277fda21c2a51929b3 100644 (file)
--- a/WebCore/bindings/js/JSNodeFilterCustom.cpp
+++ b/WebCore/bindings/js/JSNodeFilterCustom.cpp
@@ -29,7 +29,7 @@
 #include "JSNode.h"
 #include "JSNodeFilterCondition.h"
 #include "NodeFilter.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 

diff --git a/WebCore/bindings/js/JSRGBColor.h b/WebCore/bindings/js/JSRGBColor.h
index 17ecdd44a624d8b7f7501f07ee70c543db674bb6..e12f6b42441f99648b1181a8fa14ef261bded5b6 100644 (file)
--- a/WebCore/bindings/js/JSRGBColor.h
+++ b/WebCore/bindings/js/JSRGBColor.h
@@ -22,7 +22,7 @@
 #define JSRGBColor_h
 
 #include "Color.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 

diff --git a/WebCore/bindings/js/JSSVGPathSegCustom.cpp b/WebCore/bindings/js/JSSVGPathSegCustom.cpp
index 55db3a1f8500d25914c4115429e090ec3df72a2c..a7601a97d8deb4f4471d5d7db5faf98927e7134b 100644 (file)
--- a/WebCore/bindings/js/JSSVGPathSegCustom.cpp
+++ b/WebCore/bindings/js/JSSVGPathSegCustom.cpp
@@ -41,7 +41,7 @@
 #include "JSSVGPathSegMovetoAbs.h"
 #include "JSSVGPathSegMovetoRel.h"
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 #include "SVGPathSeg.h"
 #include "SVGPathSegArc.h"

diff --git a/WebCore/bindings/js/JSXMLHttpRequestConstructor.h b/WebCore/bindings/js/JSXMLHttpRequestConstructor.h
index a99e701cf664d66b0a6f80a27c38e939ffffddb9..0d9a9f4f68879dab4f0da65dad0990fdc85c39ea 100644 (file)
--- a/WebCore/bindings/js/JSXMLHttpRequestConstructor.h
+++ b/WebCore/bindings/js/JSXMLHttpRequestConstructor.h
@@ -20,7 +20,7 @@
 #ifndef JSXMLHttpRequestConstructor_h
 #define JSXMLHttpRequestConstructor_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 

diff --git a/WebCore/bindings/js/JSXSLTProcessorConstructor.h b/WebCore/bindings/js/JSXSLTProcessorConstructor.h
index c6ba013196f51af883403ec575de15d5549afe5e..8027e35b46c9c1d4c8593d504a6a196f83962dad 100644 (file)
--- a/WebCore/bindings/js/JSXSLTProcessorConstructor.h
+++ b/WebCore/bindings/js/JSXSLTProcessorConstructor.h
@@ -28,7 +28,7 @@
 
 #if ENABLE(XSLT)
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 

diff --git a/WebCore/bindings/js/JSXSLTProcessorCustom.cpp b/WebCore/bindings/js/JSXSLTProcessorCustom.cpp
index 3f5baca4c0ddcd4c5bbdaa69b9966d3982243ac1..711fdf9689d55eef009791b901c8dc7328bb050b 100644 (file)
--- a/WebCore/bindings/js/JSXSLTProcessorCustom.cpp
+++ b/WebCore/bindings/js/JSXSLTProcessorCustom.cpp
@@ -40,7 +40,7 @@
 #include "Node.h"
 #include "PlatformString.h"
 #include "XSLTProcessor.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 

diff --git a/WebCore/bindings/js/ScheduledAction.cpp b/WebCore/bindings/js/ScheduledAction.cpp
index c58c75d201172f7a956d3756b9fefba2cc51e8c8..fd1582faf5df8e33bff7b180a07259a5a4d551ff 100644 (file)
--- a/WebCore/bindings/js/ScheduledAction.cpp
+++ b/WebCore/bindings/js/ScheduledAction.cpp
@@ -30,7 +30,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "JSDOMWindow.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 
 using namespace KJS;
 
@@ -54,7 +54,7 @@ void ScheduledAction::execute(JSDOMWindowShell* windowShell)
     if (!frame->scriptProxy()->isEnabled())
         return;
 
-    KJSProxy* scriptProxy = frame->scriptProxy();
+    ScriptController* scriptProxy = frame->scriptProxy();
     
 
     scriptProxy->setProcessingTimerCallback(true);

diff --git a/WebCore/bindings/js/kjs_proxy.cpp b/WebCore/bindings/js/ScriptController.cpp
similarity index 89%
rename from WebCore/bindings/js/kjs_proxy.cpp
rename to WebCore/bindings/js/ScriptController.cpp
index a65e4ae0c2ec5d1bbeaa826f4f48b6f001793729..9a46736db338c53551f517a48ec44f9cf2830c23 100644 (file)
--- a/WebCore/bindings/js/kjs_proxy.cpp
+++ b/WebCore/bindings/js/ScriptController.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "config.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 
 #include "Console.h"
 #include "DOMWindow.h"
@@ -47,7 +47,7 @@ using namespace WebCore::EventNames;
 
 namespace WebCore {
 
-KJSProxy::KJSProxy(Frame* frame)
+ScriptController::ScriptController(Frame* frame)
     : m_frame(frame)
     , m_handlerLineno(0)
     , m_processingTimerCallback(0)
@@ -56,7 +56,7 @@ KJSProxy::KJSProxy(Frame* frame)
 {
 }
 
-KJSProxy::~KJSProxy()
+ScriptController::~ScriptController()
 {
     if (m_windowShell) {
         m_windowShell = 0;
@@ -66,7 +66,7 @@ KJSProxy::~KJSProxy()
     }
 }
 
-JSValue* KJSProxy::evaluate(const String& filename, int baseLine, const String& str) 
+JSValue* ScriptController::evaluate(const String& filename, int baseLine, const String& str) 
 {
     // evaluate code. Returns the JS return value or 0
     // if there was none, an error occured or the type couldn't be converted.
@@ -105,7 +105,7 @@ JSValue* KJSProxy::evaluate(const String& filename, int baseLine, const String&
     return 0;
 }
 
-void KJSProxy::clear()
+void ScriptController::clear()
 {
     if (!m_windowShell)
         return;
@@ -123,7 +123,7 @@ void KJSProxy::clear()
     gcController().garbageCollectSoon();
 }
 
-PassRefPtr<EventListener> KJSProxy::createHTMLEventHandler(const String& functionName, const String& code, Node* node)
+PassRefPtr<EventListener> ScriptController::createHTMLEventHandler(const String& functionName, const String& code, Node* node)
 {
     initScriptIfNeeded();
     JSLock lock;
@@ -131,7 +131,7 @@ PassRefPtr<EventListener> KJSProxy::createHTMLEventHandler(const String& functio
 }
 
 #if ENABLE(SVG)
-PassRefPtr<EventListener> KJSProxy::createSVGEventHandler(const String& functionName, const String& code, Node* node)
+PassRefPtr<EventListener> ScriptController::createSVGEventHandler(const String& functionName, const String& code, Node* node)
 {
     initScriptIfNeeded();
     JSLock lock;
@@ -139,7 +139,7 @@ PassRefPtr<EventListener> KJSProxy::createSVGEventHandler(const String& function
 }
 #endif
 
-void KJSProxy::finishedWithEvent(Event* event)
+void ScriptController::finishedWithEvent(Event* event)
 {
   // This is called when the DOM implementation has finished with a particular event. This
   // is the case in sitations where an event has been created just for temporary usage,
@@ -148,7 +148,7 @@ void KJSProxy::finishedWithEvent(Event* event)
   ScriptInterpreter::forgetDOMObject(event);
 }
 
-void KJSProxy::initScript()
+void ScriptController::initScript()
 {
     if (m_windowShell)
         return;
@@ -166,7 +166,7 @@ void KJSProxy::initScript()
     m_frame->loader()->dispatchWindowObjectAvailable();
 }
 
-bool KJSProxy::processingUserGesture() const
+bool ScriptController::processingUserGesture() const
 {
     if (!m_windowShell)
         return false;
@@ -194,13 +194,13 @@ bool KJSProxy::processingUserGesture() const
     return false;
 }
 
-bool KJSProxy::isEnabled()
+bool ScriptController::isEnabled()
 {
     Settings* settings = m_frame->settings();
     return (settings && settings->isJavaScriptEnabled());
 }
 
-void KJSProxy::attachDebugger(KJS::Debugger* debugger)
+void ScriptController::attachDebugger(KJS::Debugger* debugger)
 {
     if (!m_windowShell)
         return;
@@ -211,7 +211,7 @@ void KJSProxy::attachDebugger(KJS::Debugger* debugger)
         currentDebugger->detach(m_windowShell->window());
 }
 
-void KJSProxy::updateDocument()
+void ScriptController::updateDocument()
 {
     if (!m_frame->document())
         return;

diff --git a/WebCore/bindings/js/kjs_proxy.h b/WebCore/bindings/js/ScriptController.h
similarity index 94%
rename from WebCore/bindings/js/kjs_proxy.h
rename to WebCore/bindings/js/ScriptController.h
index aede1f24fbd758979b2008f5ec824b5f102941fc..7ae82e8477579965d2c3e031f51058f3151e1ad5 100644 (file)
--- a/WebCore/bindings/js/kjs_proxy.h
+++ b/WebCore/bindings/js/ScriptController.h
@@ -18,8 +18,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef kjs_proxy_h
-#define kjs_proxy_h
+#ifndef ScriptController_h
+#define ScriptController_h
 
 #include "JSDOMWindowShell.h"
 #include <kjs/protect.h>
@@ -40,10 +40,10 @@ class String;
 
 // FIXME: Rename this class to JSController and the Frame function to javaScript().
 
-class KJSProxy {
+class ScriptController {
 public:
-    KJSProxy(Frame*);
-    ~KJSProxy();
+    ScriptController(Frame*);
+    ~ScriptController();
 
     bool haveWindowShell() const { return m_windowShell; }
     JSDOMWindowShell* windowShell()
@@ -100,4 +100,4 @@ private:
 
 } // namespace WebCore
 
-#endif // kjs_proxy_h
+#endif // ScriptController_h

diff --git a/WebCore/bindings/js/kjs_events.cpp b/WebCore/bindings/js/kjs_events.cpp
index 6b3939b9873ee27336cb199b301526100ce0584f..6bd5732e12041f90e21e8742c926ec72de1e6c42 100644 (file)
--- a/WebCore/bindings/js/kjs_events.cpp
+++ b/WebCore/bindings/js/kjs_events.cpp
@@ -31,7 +31,7 @@
 #include "JSDOMWindow.h"
 #include "JSEvent.h"
 #include "JSEventTargetNode.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include <kjs/function_object.h>
 
 using namespace KJS;
@@ -54,7 +54,7 @@ void JSAbstractEventListener::handleEvent(Event* event, bool isWindowEvent)
     Frame* frame = window->impl()->frame();
     if (!frame)
         return;
-    KJSProxy* scriptProxy = frame->scriptProxy();
+    ScriptController* scriptProxy = frame->scriptProxy();
     if (!scriptProxy->isEnabled() || scriptProxy->isPaused())
         return;
 

diff --git a/WebCore/bindings/js/kjs_html.cpp b/WebCore/bindings/js/kjs_html.cpp
index e4856adf709e71cf2dbc69e89a8a35bfcc239dff..af812df5559d06579546744a82b14ba58649bf60 100644 (file)
--- a/WebCore/bindings/js/kjs_html.cpp
+++ b/WebCore/bindings/js/kjs_html.cpp
@@ -25,7 +25,7 @@
 #include "HTMLDocument.h"
 #include "HTMLNames.h"
 #include "JSHTMLElement.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "HTMLPlugInElement.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)

diff --git a/WebCore/bindings/js/kjs_html.h b/WebCore/bindings/js/kjs_html.h
index 02321bcc7985d99eacf8492b126c4bb7ffce7681..a3fc0622772c047d1719e19e85971cc18ffdff9f 100644 (file)
--- a/WebCore/bindings/js/kjs_html.h
+++ b/WebCore/bindings/js/kjs_html.h
@@ -20,7 +20,7 @@
 #ifndef kjs_html_h
 #define kjs_html_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 

diff --git a/WebCore/bindings/objc/DOMInternal.mm b/WebCore/bindings/objc/DOMInternal.mm
index f373d8ea5c5852362ffaa95785d2635da13472d4..74e48e5534a35e3749f8b50931b0f4f1af2943c9 100644 (file)
--- a/WebCore/bindings/objc/DOMInternal.mm
+++ b/WebCore/bindings/objc/DOMInternal.mm
@@ -37,7 +37,7 @@
 #import "SVGException.h"
 #import "WebScriptObjectPrivate.h"
 #import "XPathEvaluator.h"
-#import "kjs_proxy.h"
+#import "ScriptController.h"
 #import "runtime_root.h"
 
 //------------------------------------------------------------------------------------------

diff --git a/WebCore/bindings/scripts/CodeGeneratorJS.pm b/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 3107ba2c291d3d8745c2a17744b420ef90d6a045..c1c862030d4762a3346be6de4c82114577d1805e 100644 (file)
--- a/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -354,7 +354,7 @@ sub GenerateHeader
     if ($hasParent) {
         push(@headerContentHeader, "#include \"$parentClassName.h\"\n");
     } else {
-        push(@headerContentHeader, "#include \"kjs_binding.h\"\n");
+        push(@headerContentHeader, "#include \"JSDOMBinding.h\"\n");
         push(@headerContentHeader, "#include <kjs/JSGlobalObject.h>\n");
         push(@headerContentHeader, "#include <kjs/object_object.h>\n");
     }
@@ -997,12 +997,12 @@ sub GenerateImplementation
                 if ($attribute->signature->extendedAttributes->{"Custom"} || $attribute->signature->extendedAttributes->{"CustomGetter"}) {
                     push(@implContent, "        return $getterFunctionName(exec);\n");
                 } elsif ($attribute->signature->extendedAttributes->{"CheckNodeSecurity"}) {
-                    $implIncludes{"kjs_binding.h"} = 1;
+                    $implIncludes{"JSDOMBinding.h"} = 1;
                     push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n");
                     push(@implContent, "        return checkNodeSecurity(exec, imp->$getterFunctionName()) ? " . NativeToJSValue($attribute->signature, 0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName()") . " : jsUndefined();\n");
                 } elsif ($attribute->signature->extendedAttributes->{"CheckFrameSecurity"}) {
                     $implIncludes{"Document.h"} = 1;
-                    $implIncludes{"kjs_binding.h"} = 1;
+                    $implIncludes{"JSDOMBinding.h"} = 1;
                     push(@implContent, "        $implClassName* imp = static_cast<$implClassName*>(impl());\n");
                     push(@implContent, "        return checkNodeSecurity(exec, imp->contentDocument()) ? " . NativeToJSValue($attribute->signature,  0, $implClassName, $implClassNameForValueConversion, "imp->$getterFunctionName()") . " : jsUndefined();\n");
                 } elsif ($attribute->signature->type =~ /Constructor$/) {
@@ -1239,7 +1239,7 @@ sub GenerateImplementation
                 if ($function->signature->extendedAttributes->{"SVGCheckSecurityDocument"}) {
                     push(@implContent, "    if (!checkNodeSecurity(exec, imp->getSVGDocument(" . (@{$function->raisesExceptions} ? "ec" : "") .")))\n");
                     push(@implContent, "        return jsUndefined();\n");
-                    $implIncludes{"kjs_binding.h"} = 1;
+                    $implIncludes{"JSDOMBinding.h"} = 1;
                 }
 
                 my $paramIndex = 0;

diff --git a/WebCore/bridge/jni/jni_jsobject.mm b/WebCore/bridge/jni/jni_jsobject.mm
index 49638fbeeadb3db0b7d44a1b0e2283d33df613d8..ffc44f8e27058e5572247bb80a05622015646027 100644 (file)
--- a/WebCore/bridge/jni/jni_jsobject.mm
+++ b/WebCore/bridge/jni/jni_jsobject.mm
@@ -32,7 +32,7 @@
 #include "WebCoreFrameView.h"
 #include "jni_runtime.h"
 #include "jni_utility.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
 #include <kjs/ExecState.h>

diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index db36f832328704c6fb06fda7ddb0a4aacba79acb..7b377609207f5e4fc5569cda8607a18643ce78f6 100644 (file)
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -108,8 +108,8 @@
 #include "XMLHttpRequest.h"
 #include "XMLNames.h"
 #include "XMLTokenizer.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 
 #if ENABLE(DATABASE)
 #include "Database.h"

diff --git a/WebCore/dom/EventTarget.cpp b/WebCore/dom/EventTarget.cpp
index 638723feb7e833de8659863c664741245daae35a..02ea47fe447d3f8f95dbbcf4e19a08089aded8f7 100644 (file)
--- a/WebCore/dom/EventTarget.cpp
+++ b/WebCore/dom/EventTarget.cpp
@@ -42,7 +42,7 @@
 #include "EventNames.h"
 #include "Frame.h"
 #include "FrameView.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "RegisteredEventListener.h"
 
 namespace WebCore {

diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index c63ca5dd40ff726581f175c7f0a71768574b19f7..96c9665020cfcc6b72505605f128665bad81f567 100644 (file)
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -52,7 +52,7 @@
 #include "Text.h"
 #include "XMLNames.h"
 #include "htmlediting.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 

diff --git a/WebCore/dom/XMLTokenizer.cpp b/WebCore/dom/XMLTokenizer.cpp
index 789ac0f7ec48c8edf0a16869b6e2144f895ebb4c..0aea35c0dbd2f659900a4c7e6112aa0a24c43c4b 100644 (file)
--- a/WebCore/dom/XMLTokenizer.cpp
+++ b/WebCore/dom/XMLTokenizer.cpp
@@ -41,7 +41,7 @@
 #include "HTMLScriptElement.h"
 #include "HTMLStyleElement.h"
 #include "HTMLTokenizer.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "ProcessingInstruction.h"
 #include "ResourceError.h"
 #include "ResourceHandle.h"
@@ -846,7 +846,7 @@ void XMLTokenizer::startElementNs(const xmlChar* xmlLocalName, const xmlChar* xm
         return;
     }
 
-    KJSProxy* jsProxy = m_doc->frame() ? m_doc->frame()->scriptProxy() : 0;
+    ScriptController* jsProxy = m_doc->frame() ? m_doc->frame()->scriptProxy() : 0;
     if (jsProxy && m_doc->frame()->scriptProxy()->isEnabled())
         jsProxy->setEventHandlerLineno(lineNumber());
 

diff --git a/WebCore/history/CachedPage.cpp b/WebCore/history/CachedPage.cpp
index f328e7ba0de3cd7927ab9c9fb3b31c02aba9e0c9..be4c3146b2916c793300064c925a6fc57fef67af 100644 (file)
--- a/WebCore/history/CachedPage.cpp
+++ b/WebCore/history/CachedPage.cpp
@@ -44,7 +44,7 @@
 #include "PageGroup.h"
 #include "PausedTimeouts.h"
 #include "SystemTime.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include <kjs/JSLock.h>
 
 #if ENABLE(SVG)
@@ -93,7 +93,7 @@ CachedPage::CachedPage(Page* page)
 
     JSLock lock;
 
-    KJSProxy* proxy = mainFrame->scriptProxy();
+    ScriptController* proxy = mainFrame->scriptProxy();
     if (proxy->haveWindowShell()) {
         m_window = proxy->windowShell()->window();
         m_pausedTimeouts.set(m_window->pauseTimeouts());
@@ -119,7 +119,7 @@ void CachedPage::restore(Page* page)
 
     JSLock lock;
 
-    KJSProxy* proxy = mainFrame->scriptProxy();
+    ScriptController* proxy = mainFrame->scriptProxy();
     if (proxy->haveWindowShell()) {
         JSDOMWindowShell* windowShell = proxy->windowShell();
         if (m_window) {

diff --git a/WebCore/html/HTMLPlugInElement.cpp b/WebCore/html/HTMLPlugInElement.cpp
index 8946e0315d86e0c35006ae26d3465237c606ee26..1da3a2081a1c261a1d5fb8280b11839f239a9209 100644 (file)
--- a/WebCore/html/HTMLPlugInElement.cpp
+++ b/WebCore/html/HTMLPlugInElement.cpp
@@ -35,7 +35,7 @@
 #include "RenderWidget.h"
 #include "Settings.h"
 #include "Widget.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
 #include "runtime.h"

diff --git a/WebCore/html/HTMLScriptElement.cpp b/WebCore/html/HTMLScriptElement.cpp
index f36c72d1261b9af60469d5fcb49c70891f0fecf3..c8ac8d9781d69270fa615c9fc5616d8485d97451 100644 (file)
--- a/WebCore/html/HTMLScriptElement.cpp
+++ b/WebCore/html/HTMLScriptElement.cpp
@@ -30,7 +30,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "HTMLNames.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "MIMETypeRegistry.h"
 #include "Text.h"
 

diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp
index 7f16017f1f25e263e6b6fac7a5442bd87880fde9..8cf30e84f53dd5e689f93bb6e0eed742c59e2c5b 100644 (file)
--- a/WebCore/html/HTMLTokenizer.cpp
+++ b/WebCore/html/HTMLTokenizer.cpp
@@ -44,7 +44,7 @@
 #include "PreloadScanner.h"
 #include "Settings.h"
 #include "SystemTime.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include <wtf/ASCIICType.h>
 
 #include "HTMLEntityNames.c"
@@ -1872,7 +1872,7 @@ void HTMLTokenizer::finish()
 
 PassRefPtr<Node> HTMLTokenizer::processToken()
 {
-    KJSProxy* jsProxy = (!m_fragment && m_doc->frame()) ? m_doc->frame()->scriptProxy() : 0;
+    ScriptController* jsProxy = (!m_fragment && m_doc->frame()) ? m_doc->frame()->scriptProxy() : 0;
     if (jsProxy && m_doc->frame()->scriptProxy()->isEnabled())
         jsProxy->setEventHandlerLineno(tagStartLineno + 1); // Script line numbers are 1 based.
     if (dest > buffer) {

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index ed6f41b49ed1c892f0b8c571e0c3986d15408c25..b35b14451814c6165e4ec7a8561de13d222bec23 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -84,8 +84,8 @@
 #include "WindowFeatures.h"
 #include "XMLHttpRequest.h"
 #include "XMLTokenizer.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 #include <kjs/JSLock.h>
 #include <kjs/object.h>
 
@@ -774,7 +774,7 @@ JSValue* FrameLoader::executeScript(const String& script, bool forceUserGesture)
 
 JSValue* FrameLoader::executeScript(const String& url, int baseLine, const String& script)
 {
-    KJSProxy* scriptProxy = m_frame->scriptProxy();
+    ScriptController* scriptProxy = m_frame->scriptProxy();
 
     if (!scriptProxy->isEnabled() || scriptProxy->isPaused())
         return 0;

diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 9affbe83b2010cba2d023cf2f2943c09209745c0..cf7e4b66700b8ad659e17b942d3c83a613aac365 100644 (file)
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -71,7 +71,7 @@
 #include "TextIterator.h"
 #include "TextResourceDecoder.h"
 #include "XMLNames.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "npruntime_impl.h"
 #include "runtime_root.h"
 #include "visible_units.h"
@@ -235,7 +235,7 @@ void Frame::setView(FrameView* view)
     loader()->resetMultipleFormSubmissionProtection();
 }
 
-KJSProxy* Frame::scriptProxy()
+ScriptController* Frame::scriptProxy()
 {
     return &d->m_jscript;
 }

diff --git a/WebCore/page/Frame.h b/WebCore/page/Frame.h
index 2d9619789e05e040c79e3fbafde50fc0cf202f5e..720790ccf8f10ffb207e85410f43781e745c30aa 100644 (file)
--- a/WebCore/page/Frame.h
+++ b/WebCore/page/Frame.h
@@ -69,7 +69,7 @@ class FramePrivate;
 class FrameTree;
 class HTMLFrameOwnerElement;
 class HTMLTableCellElement;
-class KJSProxy;
+class ScriptController;
 class RegularExpression;
 class RenderPart;
 class Selection;
@@ -106,7 +106,7 @@ public:
     SelectionController* selectionController() const;
     FrameTree* tree() const;
     AnimationController* animationController() const;
-    KJSProxy* scriptProxy();
+    ScriptController* scriptProxy();
 
     RenderView* contentRenderer() const; // root renderer for the document contained in this frame
     RenderPart* ownerRenderer() const; // renderer for the element that contains this frame

diff --git a/WebCore/page/FramePrivate.h b/WebCore/page/FramePrivate.h
index 326a60ac2ac5b6d4df5fd05028496dc358b3cdb8..89688bf11185af4b37c225c2004b13f26ee54818 100644 (file)
--- a/WebCore/page/FramePrivate.h
+++ b/WebCore/page/FramePrivate.h
@@ -34,7 +34,7 @@
 #include "Range.h"
 #include "SelectionController.h"
 #include "StringHash.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 
 namespace KJS {
     class Interpreter;
@@ -80,7 +80,7 @@ namespace WebCore {
         RefPtr<FrameView> m_view;
         RefPtr<Document> m_doc;
 
-        KJSProxy m_jscript;
+        ScriptController m_jscript;
 
         String m_kjsStatusBarText;
         String m_kjsDefaultStatusBarText;

diff --git a/WebCore/page/InspectorController.cpp b/WebCore/page/InspectorController.cpp
index caf7da5064e805708419287d8191b5ed19ef43fa..18c841a58e0935fd122d576a008a217345471e3a 100644 (file)
--- a/WebCore/page/InspectorController.cpp
+++ b/WebCore/page/InspectorController.cpp
@@ -64,7 +64,7 @@
 #include "SystemTime.h"
 #include "TextEncoding.h"
 #include "TextIterator.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/JSLock.h>
 #include <JavaScriptCore/JSRetainPtr.h>

diff --git a/WebCore/page/JavaScriptDebugServer.cpp b/WebCore/page/JavaScriptDebugServer.cpp
index 7808722d9df3b4510d9fa055192bd741fa7ae19e..6f8fdb773f21dd8d1c326f0154cb1dcdd8d23b24 100644 (file)
--- a/WebCore/page/JavaScriptDebugServer.cpp
+++ b/WebCore/page/JavaScriptDebugServer.cpp
@@ -42,7 +42,7 @@
 #include "PluginView.h"
 #include "ScrollView.h"
 #include "Widget.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include <kjs/DebuggerCallFrame.h>
 #include <wtf/MainThread.h>
 #include <wtf/UnusedParam.h>

diff --git a/WebCore/page/JavaScriptProfileNode.cpp b/WebCore/page/JavaScriptProfileNode.cpp
index 903e8fe8e0a190ee810dae3ffa1530a64ca46afd..8532361ffa6b881b34a2b21388fa97d9152c5ece 100644 (file)
--- a/WebCore/page/JavaScriptProfileNode.cpp
+++ b/WebCore/page/JavaScriptProfileNode.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "JavaScriptProfileNode.h"
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include <profiler/ProfileNode.h>
 #include <JavaScriptCore/APICast.h>
 #include <JavaScriptCore/JSObjectRef.h>

diff --git a/WebCore/page/Page.cpp b/WebCore/page/Page.cpp
index bf3aec6a2b4188db13eb05874fa7b09c7dca65b4..36c32b3358e2e15660517ccc208d5d1db5e79c3a 100644 (file)
--- a/WebCore/page/Page.cpp
+++ b/WebCore/page/Page.cpp
@@ -50,7 +50,7 @@
 #include "StringHash.h"
 #include "TextResourceDecoder.h"
 #include "Widget.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include <kjs/collector.h>
 #include <kjs/JSLock.h>
 #include <wtf/HashMap.h>

diff --git a/WebCore/page/gtk/FrameGtk.cpp b/WebCore/page/gtk/FrameGtk.cpp
index 270d59ea3bb0009c78452d96eca59ba8e93acfb1..f1ad35539b8489f279567917d390626712b74253 100644 (file)
--- a/WebCore/page/gtk/FrameGtk.cpp
+++ b/WebCore/page/gtk/FrameGtk.cpp
@@ -32,7 +32,7 @@
 
 #include "NotImplemented.h"
 #include "PluginView.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "runtime_root.h"
 #include "runtime.h"
 

diff --git a/WebCore/page/mac/FrameMac.mm b/WebCore/page/mac/FrameMac.mm
index 164fa3406ea59d02982d128eaba3ef1ae0ccaf7c..2824fd3a7e032ce57c6efb49bd6f1bd944b58cf8 100644 (file)
--- a/WebCore/page/mac/FrameMac.mm
+++ b/WebCore/page/mac/FrameMac.mm
@@ -85,7 +85,7 @@
 #import "UserStyleSheetLoader.h"
 #import "WebCoreViewFactory.h"
 #import "WebScriptObjectPrivate.h"
-#import "kjs_proxy.h"
+#import "ScriptController.h"
 #import "visible_units.h"
 #import <Carbon/Carbon.h>
 #import <JavaScriptCore/APICast.h>

diff --git a/WebCore/page/qt/FrameQt.cpp b/WebCore/page/qt/FrameQt.cpp
index 2c968e780c5211bed42189ec3991e781f19124b6..cede42f9472317af8a784eac1a99a85ce65956ac 100644 (file)
--- a/WebCore/page/qt/FrameQt.cpp
+++ b/WebCore/page/qt/FrameQt.cpp
@@ -62,7 +62,7 @@
 #include "PlatformWheelEvent.h"
 #include "MouseEventWithHitTestResults.h"
 #include "SelectionController.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "TypingCommand.h"
 #include "JSLock.h"
 #include "qt_instance.h"

diff --git a/WebCore/page/win/FrameWin.cpp b/WebCore/page/win/FrameWin.cpp
index 74ca3f4a50baf171608c4a8612e51651cedabccc..5243d4e7b4d745fd53fa6de58729f79882cb3436 100644 (file)
--- a/WebCore/page/win/FrameWin.cpp
+++ b/WebCore/page/win/FrameWin.cpp
@@ -54,7 +54,7 @@
 #include "RenderView.h"
 #include "ResourceHandle.h"
 #include "TextResourceDecoder.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "npruntime_impl.h"
 #include "runtime_root.h"
 #include "GraphicsContext.h"

diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp
index cbd6e3f3dab128edb46782c74b9da279dd2f1ebc..345065936508ee46304e04e16bf6e0ac74fca2d7 100644 (file)
--- a/WebCore/plugins/PluginView.cpp
+++ b/WebCore/plugins/PluginView.cpp
@@ -51,8 +51,8 @@
 #include "PluginMessageThrottlerWin.h"
 #endif
 #include "PluginPackage.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 #include "PluginDatabase.h"
 #include "PluginDebug.h"
 #include "PluginPackage.h"
@@ -196,7 +196,7 @@ static char* createUTF8String(const String& str)
     return result;
 }
 
-static bool getString(KJSProxy* proxy, JSValue* result, String& string)
+static bool getString(ScriptController* proxy, JSValue* result, String& string)
 {
     if (!proxy || !result || result->isUndefined())
         return false;

diff --git a/WebCore/plugins/gtk/PluginViewGtk.cpp b/WebCore/plugins/gtk/PluginViewGtk.cpp
index 659f0ec1e41525402e6aaab60a538fd17448f204..ee7702616373f0682d51e8958c7cd174993cec48 100644 (file)
--- a/WebCore/plugins/gtk/PluginViewGtk.cpp
+++ b/WebCore/plugins/gtk/PluginViewGtk.cpp
@@ -49,8 +49,8 @@
 #include "PluginPackage.h"
 #include "RenderLayer.h"
 #include "Settings.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 #include "npruntime_impl.h"
 #include "runtime.h"
 #include "runtime_root.h"

diff --git a/WebCore/plugins/qt/PluginViewQt.cpp b/WebCore/plugins/qt/PluginViewQt.cpp
index 1e73c961af0db04a3afcc0906c68082405deb4d7..a65b264bae78052d0c6bab78e0f9bb109e3ff74e 100644 (file)
--- a/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/WebCore/plugins/qt/PluginViewQt.cpp
@@ -39,8 +39,8 @@
 #include "runtime_root.h"
 #include <kjs/JSLock.h>
 #include <kjs/value.h>
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 
 #include "Document.h"
 #include "DocumentLoader.h"

diff --git a/WebCore/plugins/win/PluginViewWin.cpp b/WebCore/plugins/win/PluginViewWin.cpp
index edf60a71d21434d58cdbf44651ae1e33f34370d0..0d6584317c1cb33784ce009c6549c812381c941f 100644 (file)
--- a/WebCore/plugins/win/PluginViewWin.cpp
+++ b/WebCore/plugins/win/PluginViewWin.cpp
@@ -50,8 +50,8 @@
 #include "PlatformMouseEvent.h"
 #include "PluginMessageThrottlerWin.h"
 #include "PluginPackage.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 #include "PluginDatabase.h"
 #include "PluginDebug.h"
 #include "PluginPackage.h"

diff --git a/WebCore/svg/SVGDocumentExtensions.cpp b/WebCore/svg/SVGDocumentExtensions.cpp
index 249334c9402a9e731cf300581f84ee4236cbcfda..212137fc87c9e6a499db2cbc6c4a3512ff361096 100644 (file)
--- a/WebCore/svg/SVGDocumentExtensions.cpp
+++ b/WebCore/svg/SVGDocumentExtensions.cpp
@@ -37,7 +37,7 @@
 #include "SVGSVGElement.h"
 #include "SMILTimeContainer.h"
 #include "XMLTokenizer.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 
 namespace WebCore {
 

diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp
index 359c446a94bc3a7f2a7c0299dc400a3a54b5b7ec..f712936d1bcb37c20cabc9fcad5706619e3b6846 100644 (file)
--- a/WebCore/xml/XMLHttpRequest.cpp
+++ b/WebCore/xml/XMLHttpRequest.cpp
@@ -39,7 +39,7 @@
 #include "TextResourceDecoder.h"
 #include "XMLHttpRequestException.h"
 #include "XMLHttpRequestProgressEvent.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 705a1e6f6f13654a561a851fb11c8b41261312ed..01b51aaa104a92cfdb805ecfe8f9fd89f78e36f3 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-14  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Sam.
+
+        - new names for kjs_binding.h and kjs_proxy.h
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        * webkit/webkitwebframe.cpp:
+
 2008-06-14  Darin Adler  <darin@apple.com>
 
         - fix build

diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index 82d5cd49b0acad3c966ff79ae3bab9ce96512ae9..5a0b9e12b95eaf9e8cbfe186b355865fd2f8b683 100644 (file)
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -40,8 +40,8 @@
 #include "ResourceRequest.h"
 #include "CString.h"
 #include "ProgressTracker.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 #include "webkitwebview.h"
 #include "webkitwebframe.h"
 #include "webkitprivate.h"

diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index b513722928b5a1ef66d22fe21ce8b14925253f4d..35855e6795ea1c213c4edf40dfb01ea0f5f11ed1 100644 (file)
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -38,8 +38,8 @@
 #include "JSDOMWindow.h"
 #include "PrintContext.h"
 #include "RenderView.h"
-#include "kjs_binding.h"
-#include "kjs_proxy.h"
+#include "JSDOMBinding.h"
+#include "ScriptController.h"
 
 #include <JavaScriptCore/APICast.h>
 

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 8f3e2983a422480ce3bb3dead8ca6ae6f4815f67..27f6249376cd11c254e5a24419bad33b88825a05 100644 (file)
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-14  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Sam.
+
+        - new names for kjs_binding.h and kjs_proxy.h
+
+        * WebView/WebFrame.mm:
+        * WebView/WebScriptDebugDelegate.mm:
+        * WebView/WebView.mm:
+
 2008-06-14  Darin Adler  <darin@apple.com>
 
         Rubber stamped by Sam.

diff --git a/WebKit/mac/WebView/WebFrame.mm b/WebKit/mac/WebView/WebFrame.mm
index 8130dcad1fbd26308d42a0bbf5ef16900bc0dddb..5aa10aaebd24355cb44fc8ac1fa6f9ff6c56af30 100644 (file)
--- a/WebKit/mac/WebView/WebFrame.mm
+++ b/WebKit/mac/WebView/WebFrame.mm
@@ -73,7 +73,7 @@
 #import <WebCore/TextIterator.h>
 #import <WebCore/TypingCommand.h>
 #import <WebCore/htmlediting.h>
-#import <WebCore/kjs_proxy.h>
+#import <WebCore/ScriptController.h>
 #import <WebCore/markup.h>
 #import <WebCore/visible_units.h>
 

diff --git a/WebKit/mac/WebView/WebScriptDebugDelegate.mm b/WebKit/mac/WebView/WebScriptDebugDelegate.mm
index c7294bee7018c3d5c7fa56a32bf70d13852b2bed..103220b4105b548cdb6bc330749963501f13471e 100644 (file)
--- a/WebKit/mac/WebView/WebScriptDebugDelegate.mm
+++ b/WebKit/mac/WebView/WebScriptDebugDelegate.mm
@@ -39,7 +39,7 @@
 #import <JavaScriptCore/interpreter.h>
 #import <WebCore/Frame.h>
 #import <WebCore/WebScriptObjectPrivate.h>
-#import <WebCore/kjs_proxy.h>
+#import <WebCore/ScriptController.h>
 #import <WebCore/runtime_root.h>
 
 using namespace KJS;

diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm
index 5dc18bd5c932ab115c0fc4bd602f1834a6852eaa..ecd3c62cee116020a6a25c3434f74fd22a0d79b3 100644 (file)
--- a/WebKit/mac/WebView/WebView.mm
+++ b/WebKit/mac/WebView/WebView.mm
@@ -120,7 +120,7 @@
 #import <WebCore/WebCoreObjCExtras.h>
 #import <WebCore/WebCoreTextRenderer.h>
 #import <WebCore/WebCoreView.h>
-#import <WebCore/kjs_proxy.h>
+#import <WebCore/ScriptController.h>
 #import <WebKit/DOM.h>
 #import <WebKit/DOMExtensions.h>
 #import <WebKit/DOMPrivate.h>

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 61418d302d061e42fee3a1c53350f8c19063e943..7a3d7ec1619ca333bcd7a9b49ee6d097c8ee60b7 100644 (file)
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -56,8 +56,8 @@
 #include "runtime_root.h"
 #include "JSDOMWindow.h"
 #include "qt_instance.h"
-#include "kjs_proxy.h"
-#include "kjs_binding.h"
+#include "ScriptController.h"
+#include "JSDOMBinding.h"
 #include "ExecState.h"
 #include "object.h"
 #include "qt_runtime.h"
@@ -807,7 +807,7 @@ void QWebFrame::print(QPrinter *printer) const
 */
 QVariant QWebFrame::evaluateJavaScript(const QString& scriptSource)
 {
-    KJSProxy *proxy = d->frame->scriptProxy();
+    ScriptController *proxy = d->frame->scriptProxy();
     QVariant rc;
     if (proxy) {
         KJS::JSValue *v = proxy->evaluate(String(), 1, scriptSource);

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 5b72f44398f0dfcf8437820a40133c7edaba4845..a7bea04a66ba9e23a25d087edf6dc57e5c4cc6c4 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-14  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Sam.
+
+        - new names for kjs_binding.h and kjs_proxy.h
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::evaluateJavaScript):
+        * WebKit_pch.h:
+
 2008-06-14  Darin Adler  <darin@apple.com>
 
         - fix build

diff --git a/WebKit/qt/WebKit_pch.h b/WebKit/qt/WebKit_pch.h
index 61c8d5b81c32c9eff22351dde5af82068b0ad17a..8a4f1659bb257b0981029e554f683b51960fdb9c 100644 (file)
--- a/WebKit/qt/WebKit_pch.h
+++ b/WebKit/qt/WebKit_pch.h
@@ -71,6 +71,6 @@
 #include <wtf/AlwaysInline.h>
 #include <wtf/GetPtr.h>
 
-#include "../../WebCore/bindings/js/kjs_binding.h"
+#include "../../WebCore/bindings/js/JSDOMBinding.h"
 #include "../../JavaScriptCore/kjs/math_object.h"
 #endif

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 65cb73816d789b4be480d0327bc26f80d6447997..f34d98560b6baef0f319a23a5421e95b11e1d570 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-14  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Sam.
+
+        - new names for kjs_binding.h and kjs_proxy.h
+
+        * WebFrame.cpp:
+
 2008-06-14  Darin Adler  <darin@apple.com>
 
         Rubber stamped by Sam.

diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index c9162a2d664bbf10339c5c8b37f921070f588660..120e2fefe17fcfc7825d689fbb98a43c6089fd7f 100644 (file)
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -89,8 +89,8 @@
 #include <WebCore/RenderTreeAsText.h>
 #include <WebCore/Settings.h>
 #include <WebCore/TextIterator.h>
-#include <WebCore/kjs_binding.h>
-#include <WebCore/kjs_proxy.h>
+#include <WebCore/JSDOMBinding.h>
+#include <WebCore/ScriptController.h>
 #include <JavaScriptCore/APICast.h>
 #include <wtf/MathExtras.h>
 #pragma warning(pop)

diff --git a/WebKit/wx/ChangeLog b/WebKit/wx/ChangeLog
index 81a4ce4c0e5458543f65c4873f83d465bc4e1734..63ce6d95509e53983dd286e90bc8083bd93e6cd7 100644 (file)
--- a/WebKit/wx/ChangeLog
+++ b/WebKit/wx/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-14  Darin Adler  <darin@apple.com>
+
+        Rubber stamped by Sam.
+
+        - new names for kjs_binding.h and kjs_proxy.h
+
+        * WebView.cpp:
+
 2008-06-14  Darin Adler  <darin@apple.com>
 
         - try to fix wx build, again

diff --git a/WebKit/wx/WebView.cpp b/WebKit/wx/WebView.cpp
index b3490c11f82b835ba7dd1fa8ea6e6ece4524365f..a0f263fdbbd0264c237e4e87340f0e71dc66bf05 100644 (file)
--- a/WebKit/wx/WebView.cpp
+++ b/WebKit/wx/WebView.cpp
@@ -56,8 +56,8 @@
 #include "FrameLoaderClientWx.h"
 #include "InspectorClientWx.h"
 
-#include "kjs_proxy.h"
-#include "kjs_binding.h"
+#include "ScriptController.h"
+#include "JSDOMBinding.h"
 #include <kjs/value.h>
 #include <kjs/ustring.h>
 

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b6ba260e0e3241861ef6edafc13326e983b53560..3d39cb48417a74f2e2574b7c22e420397a4dbb93 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-14  Darin Adler  <darin@apple.com>
+
+        * Scripts/do-webcore-rename: Moved planned renames into a separate hash
+        from the actual renames. Removed many renames that are either done or
+        no longer planned.
+
 2008-06-14  Darin Adler  <darin@apple.com>
 
         * Scripts/do-webcore-rename: Fixed obvious typo.

diff --git a/WebKitTools/Scripts/do-webcore-rename b/WebKitTools/Scripts/do-webcore-rename
index fc26c1624b115203af2073f3774a53a5e0b584b8..9c82b5a54beceee0b6e8c5c05d07dc37fd606e42 100755 (executable)
--- a/WebKitTools/Scripts/do-webcore-rename
+++ b/WebKitTools/Scripts/do-webcore-rename
@@ -68,30 +68,14 @@ sub wanted
 }
 
 my %renames = (
+);
+
+my %plannedRenames = (
     "ARRAY_INSTANCE_H" => "ArrayInstance_h",
     "ActivationImp" => "Activation",
     "ActivationImpData" => "ActivationData",
     "ArrayInstance" => "JSArray",
     "ArrayObjectImp" => "ArrayConstructor",
-    "ArrayProtoFuncConcat" => "ArrayFunctionConcat",
-    "ArrayProtoFuncEvery" => "ArrayFunctionEvery",
-    "ArrayProtoFuncFilter" => "ArrayFunctionFilter",
-    "ArrayProtoFuncForEach" => "ArrayFunctionForEach",
-    "ArrayProtoFuncIndexOf" => "ArrayFunctionIndexOf",
-    "ArrayProtoFuncJoin" => "ArrayFunctionJoin",
-    "ArrayProtoFuncLastIndexOf" => "ArrayFunctionLastIndexOf",
-    "ArrayProtoFuncMap" => "ArrayFunctionMap",
-    "ArrayProtoFuncPop" => "ArrayFunctionPop",
-    "ArrayProtoFuncPush" => "ArrayFunctionPush",
-    "ArrayProtoFuncReverse" => "ArrayFunctionReverse",
-    "ArrayProtoFuncShift" => "ArrayFunctionShift",
-    "ArrayProtoFuncSlice" => "ArrayFunctionSlice",
-    "ArrayProtoFuncSome" => "ArrayFunctionSome",
-    "ArrayProtoFuncSort" => "ArrayFunctionSort",
-    "ArrayProtoFuncSplice" => "ArrayFunctionSplice",
-    "ArrayProtoFuncToLocaleString" => "ArrayFunctionToLocaleString",
-    "ArrayProtoFuncToString" => "ArrayFunctionToString",
-    "ArrayProtoFuncUnShift" => "ArrayFunctionUnshift",
     "BooleanInstance" => "BooleanObject",
     "BooleanObjectImp" => "BooleanConstructor",
     "BooleanProtoFunc" => "BooleanFunction",
@@ -99,55 +83,10 @@ my %renames = (
     "DELETE_CONTENTS" => "Delete",
     "DateObjectFuncImp" => "DateFunction",
     "DateObjectImp" => "DateConstructor",
-    "DateProtoFuncGetDate" => "DateFunctionGetDate",
-    "DateProtoFuncGetDay" => "DateFunctionGetDay",
-    "DateProtoFuncGetFullYear" => "DateFunctionGetFullYear",
-    "DateProtoFuncGetHours" => "DateFunctionGetHours",
-    "DateProtoFuncGetMilliSeconds" => "DateFunctionGetMilliSeconds",
-    "DateProtoFuncGetMinutes" => "DateFunctionGetMinutes",
-    "DateProtoFuncGetMonth" => "DateFunctionGetMonth",
-    "DateProtoFuncGetSeconds" => "DateFunctionGetSeconds",
-    "DateProtoFuncGetTime" => "DateFunctionGetTime",
-    "DateProtoFuncGetTimezoneOffset" => "DateFunctionGetTimezoneOffset",
-    "DateProtoFuncGetUTCDate" => "DateFunctionGetUTCDate",
-    "DateProtoFuncGetUTCDay" => "DateFunctionGetUTCDay",
-    "DateProtoFuncGetUTCFullYear" => "DateFunctionGetUTCFullYear",
-    "DateProtoFuncGetUTCHours" => "DateFunctionGetUTCHours",
-    "DateProtoFuncGetUTCMilliseconds" => "DateFunctionGetUTCMilliseconds",
-    "DateProtoFuncGetUTCMinutes" => "DateFunctionGetUTCMinutes",
-    "DateProtoFuncGetUTCMonth" => "DateFunctionGetUTCMonth",
-    "DateProtoFuncGetUTCSeconds" => "DateFunctionGetUTCSeconds",
-    "DateProtoFuncGetYear" => "DateFunctionGetYear",
-    "DateProtoFuncSetDate" => "DateFunctionSetDate",
-    "DateProtoFuncSetFullYear" => "DateFunctionSetFullYear",
-    "DateProtoFuncSetHours" => "DateFunctionSetHours",
-    "DateProtoFuncSetMilliSeconds" => "DateFunctionSetMilliSeconds",
-    "DateProtoFuncSetMinutes" => "DateFunctionSetMinutes",
-    "DateProtoFuncSetMonth" => "DateFunctionSetMonth",
-    "DateProtoFuncSetSeconds" => "DateFunctionSetSeconds",
-    "DateProtoFuncSetTime" => "DateFunctionSetTime",
-    "DateProtoFuncSetUTCDate" => "DateFunctionSetUTCDate",
-    "DateProtoFuncSetUTCFullYear" => "DateFunctionSetUTCFullYear",
-    "DateProtoFuncSetUTCHours" => "DateFunctionSetUTCHours",
-    "DateProtoFuncSetUTCMilliseconds" => "DateFunctionSetUTCMilliseconds",
-    "DateProtoFuncSetUTCMinutes" => "DateFunctionSetUTCMinutes",
-    "DateProtoFuncSetUTCMonth" => "DateFunctionSetUTCMonth",
-    "DateProtoFuncSetUTCSeconds" => "DateFunctionSetUTCSeconds",
-    "DateProtoFuncSetYear" => "DateFunctionSetYear",
-    "DateProtoFuncToDateString" => "DateFunctionToDateString",
-    "DateProtoFuncToGMTString" => "DateFunctionToGMTString",
-    "DateProtoFuncToLocaleDateString" => "DateFunctionToLocaleDateString",
-    "DateProtoFuncToLocaleString" => "DateFunctionToLocaleString",
-    "DateProtoFuncToLocaleTimeString" => "DateFunctionToLocaleTimeString",
-    "DateProtoFuncToString" => "DateFunctionToString",
-    "DateProtoFuncToTimeString" => "DateFunctionToTimeString",
-    "DateProtoFuncToUTCString" => "DateFunctionToUTCString",
-    "DateProtoFuncValueOf" => "DateFunctionValueOf",
     "DebuggerImp" => "DebuggerData",
     "EXTRACT_CONTENTS" => "Extract",
     "ErrorObjectImp" => "ErrorConstructor",
     "ErrorProtoFuncToString" => "ErrorFunction",
-    "FRAMES_ON_STACK" => "numFramesOnStack",
     "FTPDirectoryTokenizer" => "FTPDirectoryDocumentBuilder",
     "FunctionImp" => "JSFunction",
     "FunctionObjectImp" => "FunctionConstructor",
@@ -155,8 +94,6 @@ my %renames = (
     "GetterSetterImp" => "JSGetterSetter",
     "GlobalFuncImp" => "GlobalFunction",
     "GlobalImp" => "TestGlobalObject",
-    "HTMLGenericFormElement" => "HTMLFormControlElement",
-    "HTMLGenericFormElement_h" => "HTMLFormControlElement_h",
     "HTMLTokenizer" => "HTMLDocumentBuilder",
     "ImageConstructorImp" => "JSImageConstructor",
     "ImageTokenizer" => "ImageDocumentBuilder",
@@ -170,24 +107,6 @@ my %renames = (
     "KURL_H_" => "URL_h",
     "List" => "JSArgumentList",
     "MathObjectImp" => "MathObject",
-    "MathProtoFuncACos" => "MathFunctionACos",
-    "MathProtoFuncASin" => "MathFunctionASin",
-    "MathProtoFuncATan" => "MathFunctionATan",
-    "MathProtoFuncATan2" => "MathFunctionATan2",
-    "MathProtoFuncAbs" => "MathFunctionAbs",
-    "MathProtoFuncCeil" => "MathFunctionCeil",
-    "MathProtoFuncCos" => "MathFunctionCos",
-    "MathProtoFuncExp" => "MathFunctionExp",
-    "MathProtoFuncFloor" => "MathFunctionFloor",
-    "MathProtoFuncLog" => "MathFunctionLog",
-    "MathProtoFuncMax" => "MathFunctionMax",
-    "MathProtoFuncMin" => "MathFunctionMin",
-    "MathProtoFuncPow" => "MathFunctionPow",
-    "MathProtoFuncRandom" => "MathFunctionRandom",
-    "MathProtoFuncRound" => "MathFunctionRound",
-    "MathProtoFuncSin" => "MathFunctionSin",
-    "MathProtoFuncSqrt" => "MathFunctionSqrt",
-    "MathProtoFuncTan" => "MathFunctionTan",
     "NativeErrorImp" => "NativeErrorConstructor",
     "Navigator" => "JSNavigator",
     "NumberImp" => "JSNumberCell",
@@ -198,7 +117,6 @@ my %renames = (
     "ObjectObjectImp" => "ObjectConstructor",
     "ObjectProtoFunc" => "ObjectFunction",
     "PluginTokenizer" => "PluginDocumentBuilder",
-    "RECURSIVE_MATCH_STARTNG_NEW_GROUP" => "RECURSIVE_MATCH_NEW_GROUP",
     "RegExpImp" => "RegExpObject",
     "RegExpObjectImp" => "RegExpConstructor",
     "RegExpObjectImpPrivate" => "RegExpConstructorPrivate",
@@ -211,38 +129,6 @@ my %renames = (
     "StringInstanceThatMasqueradesAsUndefined" => "StringObjectThatMasqueradesAsUndefined",
     "StringObjectFuncImp" => "StringConstructorFunction",
     "StringObjectImp" => "StringConstructor",
-    "StringProtoFuncAnchor" => "StringFunctionAnchor",
-    "StringProtoFuncBig" => "StringFunctionBig",
-    "StringProtoFuncBlink" => "StringFunctionBlink",
-    "StringProtoFuncBold" => "StringFunctionBold",
-    "StringProtoFuncCharAt" => "StringFunctionCharAt",
-    "StringProtoFuncCharCodeAt" => "StringFunctionCharCodeAt",
-    "StringProtoFuncConcat" => "StringFunctionConcat",
-    "StringProtoFuncFixed" => "StringFunctionFixed",
-    "StringProtoFuncFontcolor" => "StringFunctionFontcolor",
-    "StringProtoFuncFontsize" => "StringFunctionFontsize",
-    "StringProtoFuncIndexOf" => "StringFunctionIndexOf",
-    "StringProtoFuncItalics" => "StringFunctionItalics",
-    "StringProtoFuncLastIndexOf" => "StringFunctionLastIndexOf",
-    "StringProtoFuncLink" => "StringFunctionLink",
-    "StringProtoFuncLocaleCompare" => "StringFunctionLocaleCompare",
-    "StringProtoFuncMatch" => "StringFunctionMatch",
-    "StringProtoFuncReplace" => "StringFunctionReplace",
-    "StringProtoFuncSearch" => "StringFunctionSearch",
-    "StringProtoFuncSlice" => "StringFunctionSlice",
-    "StringProtoFuncSmall" => "StringFunctionSmall",
-    "StringProtoFuncSplit" => "StringFunctionSplit",
-    "StringProtoFuncStrike" => "StringFunctionStrike",
-    "StringProtoFuncSub" => "StringFunctionSub",
-    "StringProtoFuncSubstr" => "StringFunctionSubstr",
-    "StringProtoFuncSubstring" => "StringFunctionSubstring",
-    "StringProtoFuncSup" => "StringFunctionSup",
-    "StringProtoFuncToLocaleLowerCase" => "StringFunctionToLocaleLowerCase",
-    "StringProtoFuncToLocaleUpperCase" => "StringFunctionToLocaleUpperCase",
-    "StringProtoFuncToLowerCase" => "StringFunctionToLowerCase",
-    "StringProtoFuncToString" => "StringFunctionToString",
-    "StringProtoFuncToUpperCase" => "StringFunctionToUpperCase",
-    "StringProtoFuncValueOf" => "StringFunctionValueOf",
     "TestFunctionImp" => "TestFunction",
     "TextTokenizer" => "TextDocumentBuilder",
     "ThreadSafeShared" => "ThreadSafeRefCounted",
@@ -252,61 +138,17 @@ my %renames = (
     "XSLTProcessorPrototypeTable" => "JSXSLTProcessorPrototypeTable",
     "animationController" => "animation",
     "array_instance" => "ArrayInstance",
-    "branchfirstbyte" => "branchFirstByte",
-    "branchreqbyte" => "branchReqByte",
-    "class_charcount" => "classCharCount",
-    "class_lastchar" => "classLastChar",
-    "codeptr" => "codePtr",
     "createTokenizer" => "createBuilder",
-    "domString" => "string",
     "equalIgnoringCase" => "equalFoldingCase",
-    "errorcodeptr" => "errorCodePtr",
-    "errorptr" => "errorPtr",
-    "first_byte" => "firstByte",
-    "first_byte_caseless" => "firstByteIsCaseless",
-    "first_char" => "firstChar",
-    "firstbyte" => "firstByte",
-    "groupsetfirstbyte" => "didGroupSetFirstByte",
     "isHTMLTokenizer" => "isHTMLDocumentBuilder",
-    "is_quantifier" => "isQuantifier",
-    "isclass" => "isClass",
-    "kjs_binding" => "JSDOMBinding",
-    "kjs_binding_h" => "JSDOMBinding_h",
-    "kjs_proxy" => "ScriptController",
-    "kjs_proxy_h" => "ScriptController_h",
-    "last_branch" => "lastBranch",
     "m_tokenizer" => "m_builder",
-    "mclength" => "mcLength",
-    "negate_class" => "negateClass",
-    "offsetcount" => "offsetCount",
-    "op_type" => "opType",
-    "prev_length" => "prevLength",
     "property_slot" => "PropertySlot",
-    "ptrptr" => "ptrPtr",
-    "repeat_min" => "repeatMin",
-    "repeat_type" => "repeatType",
-    "req_byte" => "reqByte",
-    "req_byte2" => "reqByte2",
-    "req_byte_caseless" => "reqByteIsCaseless",
-    "req_caseopt" => "reqCaseOpt",
-    "req_varyopt" => "reqVaryOpt",
-    "reqbyte" => "reqByte",
-    "resetcount" => "resetCount",
     "scope_chain" => "ScopeChain",
     "scope_chain_mark" => "ScopeChainMark",
     "scope_chain_mark_h" => "ScopeChainMark_h",
     "scriptProxy" => "script",
     "selectionController" => "selection",
-    "should_flip_negation" => "shouldFlipNegation",
-    "skipbytes" => "skipBytes",
-    "subfirstbyte" => "subFirstByte",
-    "subreqbyte" => "subReqByte",
     "tokenizerProcessedData" => "documentBuilderProcessedData",
-    "top_backref" => "topBackref",
-    "top_bracket" => "topBracket",
-    "using_temporary_offsets" => "usingTemporaryOffsets",
-    "zerofirstbyte" => "zeroFirstByte",
-    "zeroreqbyte" => "zeroReqByte",
 );
 
 # rename files