Title: [148333] branches/safari-536.30-branch/LayoutTests
- Revision
- 148333
- Author
- lforsch...@apple.com
- Date
- 2013-04-12 18:47:54 -0700 (Fri, 12 Apr 2013)
Log Message
Merged r123167. <rdar://problem/13266379>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/LayoutTests/ChangeLog (148332 => 148333)
--- branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-04-13 01:44:16 UTC (rev 148332)
+++ branches/safari-536.30-branch/LayoutTests/ChangeLog 2013-04-13 01:47:54 UTC (rev 148333)
@@ -1,3 +1,16 @@
+2013-04-12 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r123167
+
+ 2012-07-19 Erik Arvidsson <a...@chromium.org>
+
+ Fix test after r123145.
+
+ Unreviewed.
+
+ * fast/js/var-declarations-shadowing-expected.txt:
+ * fast/js/var-declarations-shadowing.html:
+
2013-04-12 Tim Horton <timothy_hor...@apple.com>
Merge r132856
Modified: branches/safari-536.30-branch/LayoutTests/fast/js/var-declarations-shadowing-expected.txt (148332 => 148333)
--- branches/safari-536.30-branch/LayoutTests/fast/js/var-declarations-shadowing-expected.txt 2013-04-13 01:44:16 UTC (rev 148332)
+++ branches/safari-536.30-branch/LayoutTests/fast/js/var-declarations-shadowing-expected.txt 2013-04-13 01:47:54 UTC (rev 148333)
@@ -64,8 +64,6 @@
PASS: eval('opener == marker') should be true and is.
PASS: parent == marker should be true and is.
PASS: eval('parent == marker') should be true and is.
-PASS: top == marker should be true and is.
-PASS: eval('top == marker') should be true and is.
PASS: devicePixelRatio == marker should be true and is.
PASS: eval('devicePixelRatio == marker') should be true and is.
PASS: devicePixelRatio == marker should be true and is.
@@ -99,4 +97,6 @@
PASS: eval('document == marker') should be false and is.
PASS: crypto == marker should be false and is.
PASS: eval('crypto == marker') should be false and is.
+PASS: top == marker should be false and is.
+PASS: eval('top == marker') should be false and is.
Modified: branches/safari-536.30-branch/LayoutTests/fast/js/var-declarations-shadowing.html (148332 => 148333)
--- branches/safari-536.30-branch/LayoutTests/fast/js/var-declarations-shadowing.html 2013-04-13 01:44:16 UTC (rev 148332)
+++ branches/safari-536.30-branch/LayoutTests/fast/js/var-declarations-shadowing.html 2013-04-13 01:47:54 UTC (rev 148333)
@@ -206,12 +206,6 @@
shouldBe(eval('parent == marker'), "eval('parent == marker')", true);
try {
- eval("var top = marker");
-} catch(e) { }
-shouldBe(top == marker, "top == marker", true);
-shouldBe(eval('top == marker'), "eval('top == marker')", true);
-
-try {
eval("var devicePixelRatio = marker");
} catch(e) { }
shouldBe(devicePixelRatio == marker, "devicePixelRatio == marker", true);
@@ -309,4 +303,10 @@
shouldBe(crypto == marker, "crypto == marker", false);
shouldBe(eval('crypto == marker'), "eval('crypto == marker')", false);
+try {
+ eval("var top = marker");
+} catch(e) { }
+shouldBe(top == marker, "top == marker", false);
+shouldBe(eval('top == marker'), "eval('top == marker')", false);
+
</script>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
