summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorager@chromium.org <ager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 15:02:43 +0000
committerager@chromium.org <ager@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-03 15:02:43 +0000
commitce11568626e96fee584e8a9eabc227f3b6385e63 (patch)
tree9f33106ed8026a86690f4ce10cdaec294c4b3a3f
parentcbb6fe5d50a93dd4638e6ffaf1dc0f98360187c1 (diff)
downloadchromium_src-ce11568626e96fee584e8a9eabc227f3b6385e63.zip
chromium_src-ce11568626e96fee584e8a9eabc227f3b6385e63.tar.gz
chromium_src-ce11568626e96fee584e8a9eabc227f3b6385e63.tar.bz2
Revert 37968 - Update V8 to version 2.1.0.
This version contains a number of bugfixes including wrapping of values when calling userdefined functions and a stricter JSON parser. BUG=32191,34221 Review URL: http://codereview.chromium.org/564037 TBR=ager@chromium.org Review URL: http://codereview.chromium.org/562035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37971 0039d316-1c4b-4281-b951-d872f2087c98
-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, 6 insertions, 21 deletions
diff --git a/DEPS b/DEPS
index 99a9dd7..e9fcab1c 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@3781",
+ "http://v8.googlecode.com/svn/trunk@3690",
"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 7e40fcb..136dddd 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 8: Uncaught TypeError: undefined is not a function
+CONSOLE MESSAGE: line 413: 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 00d97e0..08f9629 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,21 +10,12 @@ 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 7e40fcb..136dddd 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 8: Uncaught TypeError: undefined is not a function
+CONSOLE MESSAGE: line 413: 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 00d97e0..08f9629 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,21 +10,12 @@ 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 4cfdfbb..4db0394 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1240,6 +1240,7 @@ 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
@@ -2805,6 +2806,7 @@ 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
@@ -2908,5 +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