[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:58:24 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 114c6e197f92ec8c378dffdeab5cf56cda7ba8ab
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Jan 8 11:44:19 2010 +0000
2010-01-08 Eric Seidel <eric at webkit.org>
No review, rolling out r52981.
http://trac.webkit.org/changeset/52981
https://bugs.webkit.org/show_bug.cgi?id=33319
Caused two JS tests to start failing:
ecma_2/RegExp/properties-001.js and js1_2/regexp/toString.js
* runtime/RegExpPrototype.cpp:
(JSC::regExpProtoFuncToString):
2010-01-08 Eric Seidel <eric at webkit.org>
No review, rolling out r52981.
http://trac.webkit.org/changeset/52981
https://bugs.webkit.org/show_bug.cgi?id=33319
Caused two JS tests to start failing:
ecma_2/RegExp/properties-001.js and js1_2/regexp/toString.js
* fast/js/kde/RegExp-expected.txt:
* fast/js/kde/script-tests/RegExp.js:
* fast/js/regexp-compile-expected.txt:
* fast/js/script-tests/regexp-compile.js:
* fast/regex/non-pattern-characters-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52984 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ae6532b..d5acb08 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-08 Eric Seidel <eric at webkit.org>
+
+ No review, rolling out r52981.
+ http://trac.webkit.org/changeset/52981
+ https://bugs.webkit.org/show_bug.cgi?id=33319
+
+ Caused two JS tests to start failing:
+ ecma_2/RegExp/properties-001.js and js1_2/regexp/toString.js
+
+ * runtime/RegExpPrototype.cpp:
+ (JSC::regExpProtoFuncToString):
+
2010-01-08 Kent Hansen <kent.hansen at nokia.com>
Reviewed by Darin Adler.
diff --git a/JavaScriptCore/runtime/RegExpPrototype.cpp b/JavaScriptCore/runtime/RegExpPrototype.cpp
index 0609b29..c3ee565 100644
--- a/JavaScriptCore/runtime/RegExpPrototype.cpp
+++ b/JavaScriptCore/runtime/RegExpPrototype.cpp
@@ -114,8 +114,8 @@ JSValue JSC_HOST_CALL regExpProtoFuncToString(ExecState* exec, JSObject*, JSValu
postfix[index++] = 'i';
if (asRegExpObject(thisValue)->get(exec, exec->propertyNames().multiline).toBoolean(exec))
postfix[index] = 'm';
- UString source = asRegExpObject(thisValue)->get(exec, exec->propertyNames().source).toString(exec);
- return jsNontrivialString(exec, makeString("/", source.size() ? source : UString("(?:)"), postfix));
+
+ return jsNontrivialString(exec, makeString("/", asRegExpObject(thisValue)->get(exec, exec->propertyNames().source).toString(exec), postfix));
}
} // namespace JSC
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5ccfdd8..d403c10 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,20 @@
2010-01-08 Eric Seidel <eric at webkit.org>
+ No review, rolling out r52981.
+ http://trac.webkit.org/changeset/52981
+ https://bugs.webkit.org/show_bug.cgi?id=33319
+
+ Caused two JS tests to start failing:
+ ecma_2/RegExp/properties-001.js and js1_2/regexp/toString.js
+
+ * fast/js/kde/RegExp-expected.txt:
+ * fast/js/kde/script-tests/RegExp.js:
+ * fast/js/regexp-compile-expected.txt:
+ * fast/js/script-tests/regexp-compile.js:
+ * fast/regex/non-pattern-characters-expected.txt:
+
+2010-01-08 Eric Seidel <eric at webkit.org>
+
Reviewed by Tor Arne Vestbø.
media/unsupported-tracks.html is failing on Snow Leopard Release bot
diff --git a/LayoutTests/fast/js/kde/RegExp-expected.txt b/LayoutTests/fast/js/kde/RegExp-expected.txt
index 6151bbf..52dbba1 100644
--- a/LayoutTests/fast/js/kde/RegExp-expected.txt
+++ b/LayoutTests/fast/js/kde/RegExp-expected.txt
@@ -92,10 +92,6 @@ PASS /\u0061/.source is '\\u0061'
PASS 'abc'.match(/\u0062/).toString() is 'b'
FAIL Object.prototype.toString.apply(RegExp.prototype) should be [object RegExp]. Was [object RegExpPrototype].
PASS typeof RegExp.prototype.toString() is 'string'
-PASS new RegExp().toString() is '/(?:)/'
-PASS (new RegExp('(?:)')).source is '(?:)'
-PASS /(?:)/.toString() is '/(?:)/'
-PASS /(?:)/.source is '(?:)'
Done.
PASS successfullyParsed is true
diff --git a/LayoutTests/fast/js/kde/script-tests/RegExp.js b/LayoutTests/fast/js/kde/script-tests/RegExp.js
index fbab840..cb7a142 100644
--- a/LayoutTests/fast/js/kde/script-tests/RegExp.js
+++ b/LayoutTests/fast/js/kde/script-tests/RegExp.js
@@ -148,11 +148,5 @@ shouldBe("Object.prototype.toString.apply(RegExp.prototype)",
// it doesn't throw an exception
shouldBe("typeof RegExp.prototype.toString()", "'string'");
-// Empty regular expressions have string representation /(?:)/
-shouldBe("new RegExp().toString()", "'/(?:)/'");
-shouldBe("(new RegExp('(?:)')).source", "'(?:)'");
-shouldBe("/(?:)/.toString()", "'/(?:)/'");
-shouldBe("/(?:)/.source", "'(?:)'");
-
debug("Done.");
successfullyParsed = true
diff --git a/LayoutTests/fast/js/regexp-compile-expected.txt b/LayoutTests/fast/js/regexp-compile-expected.txt
index a6bee52..854d50a 100644
--- a/LayoutTests/fast/js/regexp-compile-expected.txt
+++ b/LayoutTests/fast/js/regexp-compile-expected.txt
@@ -19,7 +19,7 @@ PASS re.toString() is '/c/i'
PASS re.compile(new RegExp('+')); threw exception SyntaxError: Invalid regular expression: nothing to repeat.
PASS re.toString() is '/undefined/'
PASS re.toString() is '/null/'
-PASS re.toString() is '/(?:)/'
+PASS re.toString() is '//'
PASS re.toString() is '/z/'
PASS re.lastIndex is 0
PASS re.lastIndex is 1
diff --git a/LayoutTests/fast/js/script-tests/regexp-compile.js b/LayoutTests/fast/js/script-tests/regexp-compile.js
index 5a21300..eae5787 100644
--- a/LayoutTests/fast/js/script-tests/regexp-compile.js
+++ b/LayoutTests/fast/js/script-tests/regexp-compile.js
@@ -38,7 +38,7 @@ re.compile(null);
shouldBe("re.toString()", "'/null/'");
re.compile();
-shouldBe("re.toString()", "'/(?:)/'");
+shouldBe("re.toString()", "'//'"); // /(?:)/ in Firefox
re.compile("z", undefined);
shouldBe("re.toString()", "'/z/'");
diff --git a/LayoutTests/fast/regex/non-pattern-characters-expected.txt b/LayoutTests/fast/regex/non-pattern-characters-expected.txt
index de39fed..c6c7bcb 100644
--- a/LayoutTests/fast/regex/non-pattern-characters-expected.txt
+++ b/LayoutTests/fast/regex/non-pattern-characters-expected.txt
@@ -156,7 +156,7 @@ Testing regexp: /a}/gm
PASS regexp.test('a}') is true
PASS regexp.lastIndex is 2
-Testing regexp: /(?:)/gm
+Testing regexp: //gm
PASS regexp.test('') is true
PASS regexp.lastIndex is 0
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list