summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt2
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt9
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt9
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
6 files changed, 21 insertions, 6 deletions
diff --git a/DEPS b/DEPS
index a269dac..9d7c292 100644
--- a/DEPS
+++ b/DEPS
@@ -40,7 +40,7 @@ deps = {
"http://gyp.googlecode.com/svn/trunk@776",
"src/v8":
- "http://v8.googlecode.com/svn/trunk@3690",
+ "http://v8.googlecode.com/svn/trunk@3781",
"src/native_client":
"http://nativeclient.googlecode.com/svn/trunk/src/native_client@1454",
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt
index 136dddd..7e40fcb 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 413: Uncaught TypeError: undefined is not a function
+CONSOLE MESSAGE: line 8: Uncaught TypeError: undefined is not a function
Text for bug 25290: Crash when constructing XMLHttpRequest in a detached document.
PASS
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt
index 08f9629..00d97e0 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt
@@ -10,12 +10,21 @@ CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http
CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-enumeration-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-enumeration.html. Domains, protocols and ports must match.
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-enumeration-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-enumeration.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-enumeration-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-enumeration.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-enumeration-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-enumeration.html. Domains, protocols and ports must match.
+
This tests that variable names can't be enumerated cross domain (see http://bugs.webkit.org/show_bug.cgi?id=16387)
PASS: Cross frame access by enumerating the window object was denied.
PASS: Cross frame access by getting the keys of the window object was denied.
+PASS: Cross frame access by getting the property names of the window object was denied.
PASS: Cross frame access by enumerating the History object was denied.
PASS: Cross frame access by getting the keys of the History object was denied.
+PASS: Cross frame access by getting the property names of the History object was denied.
PASS: Cross frame access by enumerating the Location object was denied.
PASS: Cross frame access by getting the keys of the Location object was denied.
+PASS: Cross frame access by getting the property names of the Location object was denied.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt
index 136dddd..7e40fcb 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/xmlhttprequest-constructor-in-detached-document-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 413: Uncaught TypeError: undefined is not a function
+CONSOLE MESSAGE: line 8: Uncaught TypeError: undefined is not a function
Text for bug 25290: Crash when constructing XMLHttpRequest in a detached document.
PASS
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt
index 08f9629..00d97e0 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt
@@ -10,12 +10,21 @@ CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http
CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-enumeration-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-enumeration.html. Domains, protocols and ports must match.
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-enumeration-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-enumeration.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-enumeration-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-enumeration.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL http://localhost:8000/security/resources/cross-frame-iframe-for-enumeration-test.html from frame with URL http://127.0.0.1:8000/security/cross-frame-access-enumeration.html. Domains, protocols and ports must match.
+
This tests that variable names can't be enumerated cross domain (see http://bugs.webkit.org/show_bug.cgi?id=16387)
PASS: Cross frame access by enumerating the window object was denied.
PASS: Cross frame access by getting the keys of the window object was denied.
+PASS: Cross frame access by getting the property names of the window object was denied.
PASS: Cross frame access by enumerating the History object was denied.
PASS: Cross frame access by getting the keys of the History object was denied.
+PASS: Cross frame access by getting the property names of the History object was denied.
PASS: Cross frame access by enumerating the Location object was denied.
PASS: Cross frame access by getting the keys of the Location object was denied.
+PASS: Cross frame access by getting the property names of the Location object was denied.
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 21c3bd3..c6afe1b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1242,7 +1242,6 @@ BUG10667 MAC : plugins/iframe-shims.html = FAIL
// NEW FOR MERGE 36102:37604
BUG32184 : fast/js/arguments.html = FAIL
-BUG32191 : fast/js/primitive-method-this.html = FAIL
// See bug http://code.google.com/p/chromium/issues/detail?id=7868,
// not urgent for current release.
BUG24227 : http/tests/plugins/local-geturl-from-remote.html = FAIL
@@ -2808,7 +2807,6 @@ BUG32153 : svg/dynamic-updates/SVGTextElement-svgdom-rotate-prop.html = TEXT
// a bunch of tests broken before the flakiness fix, i will deal with these
// after the major flakiness goes away
BUG32155 : fast/js/Object-getOwnPropertyNames.html = TEXT
-BUG32155 : http/tests/security/cross-frame-access-enumeration.html = TIMEOUT
// New flakiness?
BUG32144 WIN RELEASE : svg/webarchive/svg-script-subresouces.svg = CRASH TEXT PASS
@@ -2912,7 +2910,6 @@ BUG33997 MAC : svg/custom/dominant-baseline-hanging.svg = IMAGE
BUG33997 MAC : svg/custom/gradient-stop-corner-cases.svg = IMAGE
// WebKit roll 54127 -> 54213
-BUG34221 : fast/js/math.html = TEXT
BUG34219 : printing/page-break-always.html = TEXT
BUG34219 : printing/pageNumerForElementById.html = TEXT