Another round of tweaks after another dry run.

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

diff --git a/WebKitTools/Scripts/do-webcore-rename b/WebKitTools/Scripts/do-webcore-rename
index fe2d9545cb710652c5f0c86d2bb408be2a688d60..4008a8463d010b5c0ac0ff3284904032bd7e2ca1 100755 (executable)
--- a/WebKitTools/Scripts/do-webcore-rename
+++ b/WebKitTools/Scripts/do-webcore-rename
@@ -89,8 +89,11 @@ my %otherRenames = (
     "MouseEvent" => "PlatformMouseEvent",
     "WheelEvent" => "PlatformWheelEvent",
     "XSLTProcessor" => "JSXSLTProcessor",
-    "Document" => "Document_",
-    "Event" => "Event_",
+    "_History" => "History_",
+    "_Location" => "Location_",
+    "_Navigator" => "Navigator_",
+    "_Screen" => "Screen_",
+    "_Window" => "Window_",
     "HTMLCollection" => "JSHTMLCollection",
     "HTMLSelectCollection" => "JSHTMLSelectCollection",
     "HTMLSelectElement" => "JSHTMLSelectElement",
@@ -182,6 +185,18 @@ my %otherRenames = (
     "cssvalues" => "CSSValueStrings",
     "KSVGCSSParser" => "SVGCSSParser",
     "dispatchKHTMLEditableContentChanged" => "dispatchEditableContentChangedEvent",
+    "khtmlMousePressEvent" => "handleMousePressEvent",
+    "khtmlMouseReleaseEvent" => "handleMouseReleaseEvent",
+    "khtmlMouseDoubleClickEvent" => "handleMouseReleaseDoubleClickEvent",
+    "khtmlMouseMoveEvent" => "handleMouseMoveEvent",
+    "handleMouseMoveEventDrag" => "deleteMe1",
+    "handleMouseMoveEventOver" => "deleteMe2",
+    "handleMouseMoveEventSelection" => "handleMouseMoveEventPart2",
+    "viewportMousePressEvent" => "handleMousePressEvent",
+    "viewportMouseDoubleClickEvent" => "handleMouseDoubleClickEvent",
+    "viewportMouseMoveEvent" => "handleMouseMoveEvent",
+    "viewportMouseReleaseEvent" => "handleMouseReleaseEvent",
+    "viewportWheelEvent" => "handleWheelEvent",
 );
 
 # rename most files with names ending in Impl
@@ -260,6 +275,27 @@ for my $file (sort @paths) {
     # fix typo that annoys me
     $newContents =~ s/it.s base class/its base class/;
 
+    # fix a few things that get done wrong
+
+    $newContents =~ s/Window::Event /Window::Event_/;
+    $newContents =~ s/case Event:/case Event_:/g;
+
+    $newContents =~ s/Event, InnerHeight/Event_, InnerHeight/;
+
+    $newContents =~ s/DOMAbstractView::Document /DOMAbstractView::Document_/;
+    $newContents =~ s/Window::Document /Window::Document_/;
+    $newContents =~ s/case Document:/case Document_:/g;
+    $newContents =~ s/token == Document\b/token == Document/;
+    $newContents =~ s/Document, GetComputedStyle/Document_, GetComputedStyle/;
+    $newContents =~ s/Status, Document, Node/Status, Document_, Node/;
+
+    $newContents =~ s/JSDOMParser(\s+Window::)JSDOMParser/DOMParser$1DOMParser/;
+    $newContents =~ s/case JSDOMParser:/case DOMParser:/g;
+
+    $newContents =~ s/JSXSLTProcessor(\s+Window::)JSXSLTProcessor/XSLTProcessor$1XSLTProcessor/;
+    $newContents =~ s/XMLHttpRequest, XMLSerializer, JSDOMParser, JSXSLTProcessor/XMLHttpRequest, XMLSerializer, DOMParser, XSLTProcessor/;
+    $newContents =~ s/case JSXSLTProcessor:/case XSLTProcessor:/g;
+
     if ($newContents ne $contents) {
         open FILE, ">", $file or die;
         print FILE $newContents;