[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
oliver at apple.com
oliver at apple.com
Thu Oct 29 20:33:14 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit c04846e81fdf2fd3ffc62318e72a7e62d8bdcc91
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 24 10:55:09 2009 +0000
Roll out r48712 as it is incorrect.
Reviewed by NOBODY(rollout)
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48715 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ed4c1b5..d9074fe 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-24 Oliver Hunt <oliver at 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 at igalia.com>
Revert r48697, since it broke key handling notification to GTK+.
diff --git a/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc-expected.txt b/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc-expected.txt
index 7820552..103cc6d 100644
--- a/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc-expected.txt
+++ b/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc-expected.txt
@@ -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'
diff --git a/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html b/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html
index 0cdb755..c29c26d 100644
--- a/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html
+++ b/LayoutTests/platform/mac/fast/dom/wrapper-classes-objc.html
@@ -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
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f40ffa9..fe9bbe4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-24 Oliver Hunt <oliver at 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 at igalia.com>
Revert r48697, since it broke key handling notification to GTK+.
diff --git a/WebCore/bridge/runtime_array.cpp b/WebCore/bridge/runtime_array.cpp
index 61fbe00..feadb07 100644
--- a/WebCore/bridge/runtime_array.cpp
+++ b/WebCore/bridge/runtime_array.cpp
@@ -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);
-}
-
}
diff --git a/WebCore/bridge/runtime_array.h b/WebCore/bridge/runtime_array.h
index 4d68b42..f614f7f 100644
--- a/WebCore/bridge/runtime_array.h
+++ b/WebCore/bridge/runtime_array.h
@@ -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; }
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eb7f724..9efd035 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-24 Oliver Hunt <oliver at 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 at nokia.com>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/mac/ObjCController.m b/WebKitTools/DumpRenderTree/mac/ObjCController.m
index d7cc6a0..e0d663e 100644
--- a/WebKitTools/DumpRenderTree/mac/ObjCController.m
+++ b/WebKitTools/DumpRenderTree/mac/ObjCController.m
@@ -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]])
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list