Roll out r48712 as it is incorrect.
authoroliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Sep 2009 10:55:09 +0000 (10:55 +0000)
committeroliver@apple.com <oliver@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Sep 2009 10:55:09 +0000 (10:55 +0000)
Reviewed by NOBODY(rollout)

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

LayoutTests/ChangeLog
LayoutTests/platform/mac/fast/dom/wrapper-classes-objc-expected.txt
LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html
WebCore/ChangeLog
WebCore/bridge/runtime_array.cpp
WebCore/bridge/runtime_array.h
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/mac/ObjCController.m

index ed4c1b5..d9074fe 100644 (file)
@@ -1,3 +1,14 @@
+2009-09-24  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by NOBODY(rollout)
+
+        Roll out r48712 as it is incorrect.
+
+        Rolling out test as test depends on patch.
+
+        * platform/mac/fast/dom/wrapper-classes-objc-expected.txt:
+        * platform/mac/fast/dom/wrapper-classes-objc.html:
+
 2009-09-24  Xan Lopez  <xlopez@igalia.com>
 
         Revert r48697, since it broke key handling notification to GTK+.
index 7820552..103cc6d 100644 (file)
@@ -192,5 +192,4 @@ PASS typeof objCObjectOfClass('NSCFNumber') is 'number'
 PASS typeof objCObjectOfClass('NSCFString') is 'string'
 PASS typeof objCObjectOfClass('WebScriptObject') is 'object'
 PASS objCObjectOfClass('NSArray') instanceof Array is true
-PASS concatenateArray(objCArrayOfString()) is 'onetwothree'
 
index 0cdb755..c29c26d 100644 (file)
@@ -34,21 +34,6 @@ function objCObjectOfClass(name)
     return objCController.objectOfClass(name);
 }
 
-function objCArrayOfString()
-{
-    if (!window.objCController)
-        return "only works under DumpRenderTree";
-    return objCController.arrayOfString();
-}
-
-function concatenateArray(array)
-{
-    var result = '';
-    for (i in array)
-        result += array[i];
-    return result;
-}
-
 function tagObjCWrapperClass(tagName)
 {
     return objCWrapperClass(document.createElement(tagName));
@@ -287,8 +272,6 @@ function runTest()
     shouldBe("typeof objCObjectOfClass('WebScriptObject')", "'object'");
     shouldBeTrue("objCObjectOfClass('NSArray') instanceof Array");
 
-    shouldBe("concatenateArray(objCArrayOfString())", "'onetwothree'");
-
     // Not yet tested:
 
     // CSSCharsetRule
index f40ffa9..fe9bbe4 100644 (file)
@@ -1,3 +1,14 @@
+2009-09-24  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by NOBODY(rollout)
+
+        Roll out r48712 as it is incorrect.
+
+        Overriding getPropertyNames is incorrect.
+
+        * bridge/runtime_array.cpp:
+        * bridge/runtime_array.h:
+
 2009-09-24  Xan Lopez  <xlopez@igalia.com>
 
         Revert r48697, since it broke key handling notification to GTK+.
index 61fbe00..feadb07 100644 (file)
@@ -28,7 +28,6 @@
 
 #include <runtime/ArrayPrototype.h>
 #include <runtime/Error.h>
-#include <runtime/PropertyNameArray.h>
 #include "JSDOMBinding.h"
 
 using namespace WebCore;
@@ -146,13 +145,4 @@ bool RuntimeArray::deleteProperty(ExecState*, unsigned)
     return false;
 }
 
-void RuntimeArray::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
-{
-    const unsigned int length = getLength();
-    for (unsigned i = 0; i < length; ++i)
-        propertyNames.add(Identifier::from(exec, i));
-
-    JSObject::getPropertyNames(exec, propertyNames);
-}
-
 }
index 4d68b42..f614f7f 100644 (file)
@@ -43,7 +43,6 @@ public:
     
     virtual bool deleteProperty(ExecState *exec, const Identifier &propertyName);
     virtual bool deleteProperty(ExecState *exec, unsigned propertyName);
-    virtual void getPropertyNames(ExecState*, PropertyNameArray&);
     
     virtual const ClassInfo *classInfo() const { return &s_info; }
     
index eb7f724..9efd035 100644 (file)
@@ -1,3 +1,13 @@
+2009-09-24  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by NOBODY(rollout)
+
+        Roll out r48712 as it is incorrect.
+
+        * DumpRenderTree/mac/ObjCController.m:
+        (+[ObjCController isSelectorExcludedFromWebScript:]):
+        (+[ObjCController webScriptNameForSelector:]):
+
 2009-09-24  Benjamin Poulain  <benjamin.poulain@nokia.com>
 
         Reviewed by Eric Seidel.
index d7cc6a0..e0d663e 100644 (file)
@@ -58,7 +58,6 @@ static void* runJavaScriptThread(void* arg)
     if (0
             || aSelector == @selector(classNameOf:)
             || aSelector == @selector(objectOfClass:)
-            || aSelector == @selector(arrayOfString)
             || aSelector == @selector(identityIsEqual::)
             || aSelector == @selector(longLongRoundTrip:)
             || aSelector == @selector(unsignedLongLongRoundTrip:)
@@ -78,8 +77,6 @@ static void* runJavaScriptThread(void* arg)
         return @"className";
     if (aSelector == @selector(objectOfClass:))
         return @"objectOfClass";
-    if (aSelector == @selector(arrayOfString))
-        return @"arrayOfString";
     if (aSelector == @selector(identityIsEqual::))
         return @"identityIsEqual";
     if (aSelector == @selector(longLongRoundTrip:))
@@ -125,16 +122,6 @@ static void* runJavaScriptThread(void* arg)
     return nil;
 }
 
-- (NSArray *)arrayOfString
-{
-    NSString *strings[3];
-    strings[0] = @"one";
-    strings[1] = @"two";
-    strings[2] = @"three";
-    NSArray *array = [NSArray arrayWithObjects:strings count:3];
-    return array;
-}
-
 - (BOOL)identityIsEqual:(WebScriptObject *)a :(WebScriptObject *)b
 {
     if ([a isKindOfClass:[NSString class]] && [b isKindOfClass:[NSString class]])