summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/js/README6
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt6
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/README6
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt6
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README6
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt6
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt1
7 files changed, 36 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/js/README b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/js/README
index 72a390e..8b29133 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/js/README
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/js/README
@@ -10,3 +10,9 @@ constructor-attributes
The only difference is that V8 defines the constructor attribute on the
prototype for DOM objects just as for other objects.
The V8 implementation is consistent with the JavaScript specification and IE.
+
+function-dot-arguments-and-caller
+--------------------------
+The only difference is that V8 defines the caller of a custom toString function
+as the function that calls toString() on the object. This treatment is
+consistent with Firefox.
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt
new file mode 100644
index 0000000..2afc581
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt
@@ -0,0 +1,6 @@
+This page tests function.caller and function.arguments in interesting nested scopes.
+
+If the test passes, you'll see a series of PASS messages below.
+
+PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,FAIL,PASS
+
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/README b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/README
index 72a390e..8b29133 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/README
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/README
@@ -10,3 +10,9 @@ constructor-attributes
The only difference is that V8 defines the constructor attribute on the
prototype for DOM objects just as for other objects.
The V8 implementation is consistent with the JavaScript specification and IE.
+
+function-dot-arguments-and-caller
+--------------------------
+The only difference is that V8 defines the caller of a custom toString function
+as the function that calls toString() on the object. This treatment is
+consistent with Firefox.
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt
new file mode 100644
index 0000000..2afc581
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt
@@ -0,0 +1,6 @@
+This page tests function.caller and function.arguments in interesting nested scopes.
+
+If the test passes, you'll see a series of PASS messages below.
+
+PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,FAIL,PASS
+
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README
index 8d0b839..c53e088 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README
@@ -132,3 +132,9 @@ constructor-attributes
The only difference is that V8 defines the constructor attribute on the
prototype for DOM objects just as for other objects.
The V8 implementation is consistent with the JavaScript specification and IE.
+
+function-dot-arguments-and-caller
+--------------------------
+The only difference is that V8 defines the caller of a custom toString function
+as the function that calls toString() on the object. This treatment is
+consistent with Firefox.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt
new file mode 100644
index 0000000..2afc581
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt
@@ -0,0 +1,6 @@
+This page tests function.caller and function.arguments in interesting nested scopes.
+
+If the test passes, you'll see a series of PASS messages below.
+
+PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,PASS,FAIL,PASS
+
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index e31e7ce..510ada4 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -531,7 +531,6 @@ SKIP : LayoutTests/http/tests/appcache = TIMEOUT FAIL
// V8 failures as a result of the WebKit merge.
// http://code.google.com/p/v8/issues/detail?id=92
LayoutTests/fast/js/exception-try-finally-scope-error.html = FAIL
-LayoutTests/fast/js/function-dot-arguments-and-caller.html = FAIL
LayoutTests/fast/js/global-recursion-on-full-stack.html = FAIL
LayoutTests/fast/js/pic/cached-prototype-setter.html = FAIL
LayoutTests/fast/js/removing-Cf-characters.html = FAIL