summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt3
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt3
3 files changed, 5 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index a22d846..436c273 100644
--- a/DEPS
+++ b/DEPS
@@ -32,7 +32,7 @@ deps = {
"http://gyp.googlecode.com/svn/trunk@532",
"src/v8":
- "http://v8.googlecode.com/svn/trunk@2291",
+ "http://v8.googlecode.com/svn/trunk@2329",
"src/third_party/skia":
"http://skia.googlecode.com/svn/trunk@239",
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt
index d920c58..cb892ba 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt
@@ -22,6 +22,7 @@ Frame: '<!--framePath //<!--frame0-->-->'
PASS: window.history.back should be 'function () { [native code] }' and is.
PASS: window.history.forward should be 'function () { [native code] }' and is.
PASS: window.history.go should be 'function () { [native code] }' and is.
-PASS: window.history.toString should be 'function toString() { var c = ClassOf(this); if (c === 'Arguments') c = 'Object'; return "[object " + c + "]";}' and is.
+PASS: window.history.toString should be 'function toString() { var c = _ClassOf(this); if (c === 'Arguments') c = 'Object'; return "[object " + c + "]";}' and is.
PASS: window.history.length matched the expected value.
PASS: window.history.customAttribute should be 'customAttribute' and is.
+
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt
index d920c58..cb892ba 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-history-put-expected.txt
@@ -22,6 +22,7 @@ Frame: '<!--framePath //<!--frame0-->-->'
PASS: window.history.back should be 'function () { [native code] }' and is.
PASS: window.history.forward should be 'function () { [native code] }' and is.
PASS: window.history.go should be 'function () { [native code] }' and is.
-PASS: window.history.toString should be 'function toString() { var c = ClassOf(this); if (c === 'Arguments') c = 'Object'; return "[object " + c + "]";}' and is.
+PASS: window.history.toString should be 'function toString() { var c = _ClassOf(this); if (c === 'Arguments') c = 'Object'; return "[object " + c + "]";}' and is.
PASS: window.history.length matched the expected value.
PASS: window.history.customAttribute should be 'customAttribute' and is.
+