WebKitTools:

        Reviewed by Mark Rowe.

        Remove 'objC' prefix from methods now in the ObjCController.

        * DumpRenderTree/ObjCController.m:
        (+[ObjCController isSelectorExcludedFromWebScript:]):
        (+[ObjCController webScriptNameForSelector:]):
        (-[ObjCController classNameOf:]):
        (-[ObjCController objectOfClass:]):
        (-[ObjCController identityIsEqual::]):
        (-[ObjCController longLongRoundTrip:]):
        (-[ObjCController unsignedLongLongRoundTrip:]):

LayoutTests:

        Reviewed by Mark Rowe.

        Update tests now that the 'objC' prefix is no longer used for methods of the ObjCController.

        * fast/dom/wrapper-classes.html:
        * platform/mac/fast/objc/longlongTest.html:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1ca5c4bf08e3d7c086f813792359ad700f731a3e..a08e5bac62ad381a0d7a52ef15816954ad00e1a1 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-09  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Update tests now that the 'objC' prefix is no longer used for methods of the ObjCController.
+
+        * fast/dom/wrapper-classes.html:
+        * platform/mac/fast/objc/longlongTest.html:
+
 2007-09-09  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Oliver.

diff --git a/LayoutTests/fast/dom/wrapper-classes.html b/LayoutTests/fast/dom/wrapper-classes.html
index dcad2f63a2b46f9742544a78fa2516008f65f229..76086f705d28aa38a5a65ded9c8943d8e782662a 100644 (file)
--- a/LayoutTests/fast/dom/wrapper-classes.html
+++ b/LayoutTests/fast/dom/wrapper-classes.html
@@ -31,14 +31,14 @@ function objCWrapperClass(node)
 {
     if (!window.objCController)
         return "only works under DumpRenderTree";
-    return objCController.objCClassName(node);
+    return objCController.className(node);
 }
 
 function objCObjectOfClass(name)
 {
     if (!window.objCController)
         return "only works under DumpRenderTree";
-    return objCController.objCObjectOfClass(name);
+    return objCController.objectOfClass(name);
 }
 
 function tagJSWrapperClass(tagName)

diff --git a/LayoutTests/platform/mac/fast/objc/longlongTest.html b/LayoutTests/platform/mac/fast/objc/longlongTest.html
index a4a196e6cf2834b8e96d50728a4ad8664dc1ad10..cb390cc141707be9bb55bf6ade0d3f7795dda16d 100644 (file)
--- a/LayoutTests/platform/mac/fast/objc/longlongTest.html
+++ b/LayoutTests/platform/mac/fast/objc/longlongTest.html
@@ -9,7 +9,7 @@
 
             function testLongLong(num, expected)
             {
-                var result = objCController.objCLongLongRoundTrip(num);
+                var result = objCController.longLongRoundTrip(num);
                 if (result == expected)
                     log("PASS Test LongLong: result is " + result + " as expected!");
                 else
@@ -18,7 +18,7 @@
 
             function testUnsignedLongLong(num, expected)
             {
-                var result = objCController.objCUnsignedLongLongRoundTrip(num);
+                var result = objCController.unsignedLongLongRoundTrip(num);
                 if (result == expected)
                     log("PASS Test UnsignedLongLong: result is " + result + " as expected!");
                 else

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b30db95ce00f8a4c25adb6f7a4c08e2691f6ee4b..34e19cc4932452801dbdc77008d3bdde60c6c2a8 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2007-09-09  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Mark Rowe.
+
+        Remove 'objC' prefix from methods now in the ObjCController. 
+
+        * DumpRenderTree/ObjCController.m:
+        (+[ObjCController isSelectorExcludedFromWebScript:]):
+        (+[ObjCController webScriptNameForSelector:]):
+        (-[ObjCController classNameOf:]):
+        (-[ObjCController objectOfClass:]):
+        (-[ObjCController identityIsEqual::]):
+        (-[ObjCController longLongRoundTrip:]):
+        (-[ObjCController unsignedLongLongRoundTrip:]):
+
 2007-09-09  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Oliver.

diff --git a/WebKitTools/DumpRenderTree/ObjCController.m b/WebKitTools/DumpRenderTree/ObjCController.m
index b55c6d8073987bdc67c8960d5148d22e340df3be..d9662de46ba148d7a6634aa124d74bb64f009d67 100644 (file)
--- a/WebKitTools/DumpRenderTree/ObjCController.m
+++ b/WebKitTools/DumpRenderTree/ObjCController.m
@@ -36,11 +36,11 @@
 + (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector
 {
     if (0
-            || aSelector == @selector(objCClassNameOf:)
-            || aSelector == @selector(objCObjectOfClass:)
-            || aSelector == @selector(objCIdentityIsEqual::)
-            || aSelector == @selector(objCLongLongRoundTrip:)
-            || aSelector == @selector(objCUnsignedLongLongRoundTrip:)
+            || aSelector == @selector(classNameOf:)
+            || aSelector == @selector(objectOfClass:)
+            || aSelector == @selector(identityIsEqual::)
+            || aSelector == @selector(longLongRoundTrip:)
+            || aSelector == @selector(unsignedLongLongRoundTrip:)
             || aSelector == @selector(testWrapperRoundTripping:))
         return NO;
     return YES;
@@ -48,30 +48,30 @@
 
 + (NSString *)webScriptNameForSelector:(SEL)aSelector
 {
-    if (aSelector == @selector(objCClassNameOf:))
-        return @"objCClassName";
-    if (aSelector == @selector(objCObjectOfClass:))
-        return @"objCObjectOfClass";
-    if (aSelector == @selector(objCIdentityIsEqual::))
-        return @"objCIdentityIsEqual";
-    if (aSelector == @selector(objCLongLongRoundTrip:))
-        return @"objCLongLongRoundTrip";
-    if (aSelector == @selector(objCUnsignedLongLongRoundTrip:))
-        return @"objCUnsignedLongLongRoundTrip";
+    if (aSelector == @selector(classNameOf:))
+        return @"className";
+    if (aSelector == @selector(objectOfClass:))
+        return @"objectOfClass";
+    if (aSelector == @selector(identityIsEqual::))
+        return @"identityIsEqual";
+    if (aSelector == @selector(longLongRoundTrip:))
+        return @"longLongRoundTrip";
+    if (aSelector == @selector(unsignedLongLongRoundTrip:))
+        return @"unsignedLongLongRoundTrip";
     if (aSelector == @selector(testWrapperRoundTripping:))
         return @"testWrapperRoundTripping";
 
     return nil;
 }
 
-- (NSString *)objCClassNameOf:(id)object
+- (NSString *)classNameOf:(id)object
 {
     if (!object)
         return @"nil";
     return NSStringFromClass([object class]);
 }
 
-- (id)objCObjectOfClass:(NSString *)aClass
+- (id)objectOfClass:(NSString *)aClass
 {
     if ([aClass isEqualToString:@"NSNull"])
         return [NSNull null];
@@ -91,17 +91,17 @@
     return nil;
 }
 
-- (BOOL)objCIdentityIsEqual:(WebScriptObject *)a :(WebScriptObject *)b
+- (BOOL)identityIsEqual:(WebScriptObject *)a :(WebScriptObject *)b
 {
     return a == b;
 }
 
-- (long long)objCLongLongRoundTrip:(long long)num
+- (long long)longLongRoundTrip:(long long)num
 {
     return num;
 }
 
-- (unsigned long long)objCUnsignedLongLongRoundTrip:(unsigned long long)num
+- (unsigned long long)unsignedLongLongRoundTrip:(unsigned long long)num
 {
     return num;
 }