WebCore:
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 15 Jun 2008 07:00:11 +0000 (07:00 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 15 Jun 2008 07:00:11 +0000 (07:00 +0000)
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

89 files changed:
WebCore/ChangeLog
WebCore/GNUmakefile.am
WebCore/WebCore.pro
WebCore/WebCore.vcproj/WebCore.vcproj
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/WebCoreSources.bkl
WebCore/bindings/js/JSAudioConstructor.h
WebCore/bindings/js/JSCustomSQLStatementCallback.cpp
WebCore/bindings/js/JSCustomSQLStatementErrorCallback.cpp
WebCore/bindings/js/JSCustomSQLTransactionCallback.cpp
WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp
WebCore/bindings/js/JSCustomVoidCallback.cpp
WebCore/bindings/js/JSCustomXPathNSResolver.cpp
WebCore/bindings/js/JSDOMBinding.cpp [moved from WebCore/bindings/js/kjs_binding.cpp with 99% similarity]
WebCore/bindings/js/JSDOMBinding.h [moved from WebCore/bindings/js/kjs_binding.h with 98% similarity]
WebCore/bindings/js/JSDOMWindowBase.cpp
WebCore/bindings/js/JSDOMWindowBase.h
WebCore/bindings/js/JSDOMWindowCustom.cpp
WebCore/bindings/js/JSDOMWindowShell.cpp
WebCore/bindings/js/JSDOMWindowShell.h
WebCore/bindings/js/JSDocumentCustom.cpp
WebCore/bindings/js/JSHTMLCollectionCustom.cpp
WebCore/bindings/js/JSHTMLFrameElementCustom.cpp
WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp
WebCore/bindings/js/JSHTMLIFrameElementCustom.cpp
WebCore/bindings/js/JSHTMLInputElementBase.h
WebCore/bindings/js/JSHTMLOptionElementConstructor.h
WebCore/bindings/js/JSImageConstructor.h
WebCore/bindings/js/JSLocationCustom.cpp
WebCore/bindings/js/JSNamedNodeMapCustom.cpp
WebCore/bindings/js/JSNamedNodesCollection.h
WebCore/bindings/js/JSNodeFilterCondition.cpp
WebCore/bindings/js/JSNodeFilterCustom.cpp
WebCore/bindings/js/JSRGBColor.h
WebCore/bindings/js/JSSVGPathSegCustom.cpp
WebCore/bindings/js/JSXMLHttpRequestConstructor.h
WebCore/bindings/js/JSXSLTProcessorConstructor.h
WebCore/bindings/js/JSXSLTProcessorCustom.cpp
WebCore/bindings/js/ScheduledAction.cpp
WebCore/bindings/js/ScriptController.cpp [moved from WebCore/bindings/js/kjs_proxy.cpp with 89% similarity]
WebCore/bindings/js/ScriptController.h [moved from WebCore/bindings/js/kjs_proxy.h with 94% similarity]
WebCore/bindings/js/kjs_events.cpp
WebCore/bindings/js/kjs_html.cpp
WebCore/bindings/js/kjs_html.h
WebCore/bindings/objc/DOMInternal.mm
WebCore/bindings/scripts/CodeGeneratorJS.pm
WebCore/bridge/jni/jni_jsobject.mm
WebCore/dom/Document.cpp
WebCore/dom/EventTarget.cpp
WebCore/dom/Node.cpp
WebCore/dom/XMLTokenizer.cpp
WebCore/history/CachedPage.cpp
WebCore/html/HTMLPlugInElement.cpp
WebCore/html/HTMLScriptElement.cpp
WebCore/html/HTMLTokenizer.cpp
WebCore/loader/FrameLoader.cpp
WebCore/page/Frame.cpp
WebCore/page/Frame.h
WebCore/page/FramePrivate.h
WebCore/page/InspectorController.cpp
WebCore/page/JavaScriptDebugServer.cpp
WebCore/page/JavaScriptProfileNode.cpp
WebCore/page/Page.cpp
WebCore/page/gtk/FrameGtk.cpp
WebCore/page/mac/FrameMac.mm
WebCore/page/qt/FrameQt.cpp
WebCore/page/win/FrameWin.cpp
WebCore/plugins/PluginView.cpp
WebCore/plugins/gtk/PluginViewGtk.cpp
WebCore/plugins/qt/PluginViewQt.cpp
WebCore/plugins/win/PluginViewWin.cpp
WebCore/svg/SVGDocumentExtensions.cpp
WebCore/xml/XMLHttpRequest.cpp
WebKit/gtk/ChangeLog
WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
WebKit/gtk/webkit/webkitwebframe.cpp
WebKit/mac/ChangeLog
WebKit/mac/WebView/WebFrame.mm
WebKit/mac/WebView/WebScriptDebugDelegate.mm
WebKit/mac/WebView/WebView.mm
WebKit/qt/Api/qwebframe.cpp
WebKit/qt/ChangeLog
WebKit/qt/WebKit_pch.h
WebKit/win/ChangeLog
WebKit/win/WebFrame.cpp
WebKit/wx/ChangeLog
WebKit/wx/WebView.cpp
WebKitTools/ChangeLog
WebKitTools/Scripts/do-webcore-rename

index 05d4057..6e91ec9 100644 (file)
@@ -2,6 +2,98 @@
 
         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.
+
         - renamed HTMLGenericFormElement to HTMLFormControlElement
 
         * GNUmakefile.am:
index 9dbedb1..65bce16 100644 (file)
@@ -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 \
index 86c4665..0e8aa8c 100644 (file)
@@ -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 \
index e20214b..b2597f2 100644 (file)
                                        >\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
                                        >\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
index 3d1c049..08293b4 100644 (file)
                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, ); }; };
                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>"; };
                                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 */,
                                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 */,
                                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 */,
index e60cbb1..a8cec38 100644 (file)
@@ -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>
index 2325053..01f0fa1 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(VIDEO)
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index a9d2cf2..b188cdd 100644 (file)
@@ -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"
 
index 8fa174a..1c0ae6c 100644 (file)
@@ -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"
 
index 7e73879..a396171 100644 (file)
@@ -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>
index 63a56a2..6db92c0 100644 (file)
@@ -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 {
index aa5a994..8dd6ce8 100644 (file)
@@ -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 {
     
index a8e381d..3a64628 100644 (file)
@@ -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 {
 
similarity index 99%
rename from WebCore/bindings/js/kjs_binding.cpp
rename to WebCore/bindings/js/JSDOMBinding.cpp
index 14aa1d2..93a0cef 100644 (file)
@@ -24,7 +24,7 @@
 #endif
 
 #include "config.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 #include "DOMCoreException.h"
 #include "Document.h"
similarity index 98%
rename from WebCore/bindings/js/kjs_binding.h
rename to WebCore/bindings/js/JSDOMBinding.h
index fc45a3c..af7bce1 100644 (file)
@@ -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
index e19cd5b..14b0769 100644 (file)
@@ -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>
 
index 483b874..6d24607 100644 (file)
@@ -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>
index 79b2d07..0b41ec5 100644 (file)
@@ -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;
index 7b5c31f..510b092 100644 (file)
@@ -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;
index 3980010..4b81158 100644 (file)
@@ -30,7 +30,7 @@
 #define JSDOMWindowShell_h
 
 #include "JSDOMWindow.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 
index e6dfa93..f43a535 100644 (file)
@@ -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"
index 51d839a..eb274c7 100644 (file)
@@ -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>
 
index 9fccb44..4eb946f 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "CSSHelper.h"
 #include "HTMLFrameElement.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 
index ff2f89d..828b959 100644 (file)
@@ -32,7 +32,7 @@
 #include "HTMLNames.h"
 #include "JSDOMWindow.h"
 #include "JSDOMWindowShell.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 
index 5645ebe..8aa0b79 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "CSSHelper.h"
 #include "HTMLIFrameElement.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 
index 540cb3f..3f7e62e 100644 (file)
@@ -21,7 +21,7 @@
 #define JSHTMLInputElementBase_h
 
 #include "JSHTMLElement.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include "kjs_html.h"
 
 namespace WebCore {
index 426d7fe..6b37cfb 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef JSHTMLOptionElementConstructor_h
 #define JSHTMLOptionElementConstructor_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
index 6f9a65a..f170e43 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef JSImageConstructor_h
 #define JSImageConstructor_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 
index c8b8c2a..a583b68 100644 (file)
@@ -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;
 
index de1a851..74e35af 100644 (file)
@@ -30,7 +30,7 @@
 #include "NamedNodeMap.h"
 #include "Node.h"
 #include "PlatformString.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 
index d8d7a21..54ccd85 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef JSNamedNodesCollection_h
 #define JSNamedNodesCollection_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 #include <wtf/Vector.h>
 
 namespace WebCore {
index 08f3334..a6cf60d 100644 (file)
@@ -25,7 +25,7 @@
 #include "JSNode.h"
 #include "JSNodeFilter.h"
 #include "NodeFilter.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 
 namespace WebCore {
 
index bbbe964..15ba5b5 100644 (file)
@@ -29,7 +29,7 @@
 #include "JSNode.h"
 #include "JSNodeFilterCondition.h"
 #include "NodeFilter.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 
index 17ecdd4..e12f6b4 100644 (file)
@@ -22,7 +22,7 @@
 #define JSRGBColor_h
 
 #include "Color.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 
index 55db3a1..a7601a9 100644 (file)
@@ -41,7 +41,7 @@
 #include "JSSVGPathSegMovetoAbs.h"
 #include "JSSVGPathSegMovetoRel.h"
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 #include "SVGPathSeg.h"
 #include "SVGPathSegArc.h"
index a99e701..0d9a9f4 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef JSXMLHttpRequestConstructor_h
 #define JSXMLHttpRequestConstructor_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 
index c6ba013..8027e35 100644 (file)
@@ -28,7 +28,7 @@
 
 #if ENABLE(XSLT)
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 
index 3f5baca..711fdf9 100644 (file)
@@ -40,7 +40,7 @@
 #include "Node.h"
 #include "PlatformString.h"
 #include "XSLTProcessor.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 using namespace KJS;
 
index c58c75d..fd1582f 100644 (file)
@@ -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);
similarity index 89%
rename from WebCore/bindings/js/kjs_proxy.cpp
rename to WebCore/bindings/js/ScriptController.cpp
index a65e4ae..9a46736 100644 (file)
@@ -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;
similarity index 94%
rename from WebCore/bindings/js/kjs_proxy.h
rename to WebCore/bindings/js/ScriptController.h
index aede1f2..7ae82e8 100644 (file)
@@ -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
index 6b3939b..6bd5732 100644 (file)
@@ -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;
 
index e4856ad..af812df 100644 (file)
@@ -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)
index 02321bc..a3fc062 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef kjs_html_h
 #define kjs_html_h
 
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 
index f373d8e..74e48e5 100644 (file)
@@ -37,7 +37,7 @@
 #import "SVGException.h"
 #import "WebScriptObjectPrivate.h"
 #import "XPathEvaluator.h"
-#import "kjs_proxy.h"
+#import "ScriptController.h"
 #import "runtime_root.h"
 
 //------------------------------------------------------------------------------------------
index 3107ba2..c1c8620 100644 (file)
@@ -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;
index 49638fb..ffc44f8 100644 (file)
@@ -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>
index db36f83..7b37760 100644 (file)
 #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"
index 638723f..02ea47f 100644 (file)
@@ -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 {
index c63ca5d..96c9665 100644 (file)
@@ -52,7 +52,7 @@
 #include "Text.h"
 #include "XMLNames.h"
 #include "htmlediting.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 
index 789ac0f..0aea35c 100644 (file)
@@ -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());
 
index f328e7b..be4c314 100644 (file)
@@ -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) {
index 8946e03..1da3a20 100644 (file)
@@ -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"
index f36c72d..c8ac8d9 100644 (file)
@@ -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"
 
index 7f16017..8cf30e8 100644 (file)
@@ -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) {
index ed6f41b..b35b144 100644 (file)
@@ -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;
index 9affbe8..cf7e4b6 100644 (file)
@@ -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;
 }
index 2d96197..720790c 100644 (file)
@@ -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
index 326a60a..89688bf 100644 (file)
@@ -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;
index caf7da5..18c841a 100644 (file)
@@ -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>
index 7808722..6f8fdb7 100644 (file)
@@ -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>
index 903e8fe..8532361 100644 (file)
@@ -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>
index bf3aec6..36c32b3 100644 (file)
@@ -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>
index 270d59e..f1ad355 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "NotImplemented.h"
 #include "PluginView.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 #include "runtime_root.h"
 #include "runtime.h"
 
index 164fa34..2824fd3 100644 (file)
@@ -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>
index 2c968e7..cede42f 100644 (file)
@@ -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"
index 74ca3f4..5243d4e 100644 (file)
@@ -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"
index cbd6e3f..3450659 100644 (file)
@@ -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;
index 659f0ec..ee77026 100644 (file)
@@ -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"
index 1e73c96..a65b264 100644 (file)
@@ -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"
index edf60a7..0d65843 100644 (file)
@@ -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"
index 249334c..212137f 100644 (file)
@@ -37,7 +37,7 @@
 #include "SVGSVGElement.h"
 #include "SMILTimeContainer.h"
 #include "XMLTokenizer.h"
-#include "kjs_proxy.h"
+#include "ScriptController.h"
 
 namespace WebCore {
 
index 359c446..f712936 100644 (file)
@@ -39,7 +39,7 @@
 #include "TextResourceDecoder.h"
 #include "XMLHttpRequestException.h"
 #include "XMLHttpRequestProgressEvent.h"
-#include "kjs_binding.h"
+#include "JSDOMBinding.h"
 
 namespace WebCore {
 
index 705a1e6..01b51aa 100644 (file)
@@ -1,5 +1,14 @@
 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
 
         * webkit/webkitwebframe.cpp: Remove a bogus release() call.
index 82d5cd4..5a0b9e1 100644 (file)
@@ -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"
index b513722..35855e6 100644 (file)
@@ -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>
 
index 8f3e298..27f6249 100644 (file)
@@ -2,6 +2,16 @@
 
         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.
+
         - renamed HTMLGenericFormElement to HTMLFormControlElement
 
         * WebView/WebHTMLRepresentation.mm:
index 8130dca..5aa10aa 100644 (file)
@@ -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>
 
index c7294be..103220b 100644 (file)
@@ -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;
index 5dc18bd..ecd3c62 100644 (file)
 #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>
index 61418d3..7a3d7ec 100644 (file)
@@ -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);
index 5b72f44..a7bea04 100644 (file)
@@ -1,5 +1,15 @@
 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
 
         * Api/qwebframe.cpp:
index 61c8d5b..8a4f165 100644 (file)
@@ -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
index 65cb738..f34d985 100644 (file)
@@ -2,6 +2,14 @@
 
         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.
+
         - renamed HTMLGenericFormElement to HTMLFormControlElement
 
         * WebFrame.cpp:
index c9162a2..120e2fe 100644 (file)
@@ -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)
index 81a4ce4..63ce6d9 100644 (file)
@@ -1,5 +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.cpp:
+
+2008-06-14  Darin Adler  <darin@apple.com>
+
         - try to fix wx build, again
 
         * WebView.cpp:
index b3490c1..a0f263f 100644 (file)
@@ -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>
 
index b6ba260..3d39cb4 100644 (file)
@@ -1,5 +1,11 @@
 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.
 
 2008-06-13  Darin Adler  <darin@apple.com>
index fc26c16..9c82b5a 100755 (executable)
@@ -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