summaryrefslogtreecommitdiffstats
path: root/webkit/data
diff options
context:
space:
mode:
authorkasperl@google.com <kasperl@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-03 10:33:44 +0000
committerkasperl@google.com <kasperl@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-03 10:33:44 +0000
commit7a716c861bd7b301ce31445f9a7a30ddcc934c61 (patch)
tree85c0fbfdad159f5ad8a8d846cab3102097104d1d /webkit/data
parent862ccd37346ed6e9492b7f0b062ef6b576f3e046 (diff)
downloadchromium_src-7a716c861bd7b301ce31445f9a7a30ddcc934c61.zip
chromium_src-7a716c861bd7b301ce31445f9a7a30ddcc934c61.tar.gz
chromium_src-7a716c861bd7b301ce31445f9a7a30ddcc934c61.tar.bz2
Update WebKit to r55424. Rebaseline fast/dom/DOMException/prototype-object.html
expectations after r55416 which fixed the V8 code generator to use the correct visible name for DOMException. To make the WebGL layout tests continue to run on the Mac bots, I've pulled in http://codereview.chromium.org/660354 and made sure that WebGL is also enabled in the test shell. BUG=37098 TEST=None Review URL: http://codereview.chromium.org/660446 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/data')
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt4
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt
index 3afbba2..64c6046 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt
@@ -4,9 +4,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS e.toString() is "Error: HIERARCHY_REQUEST_ERR: DOM Exception 3"
-FAIL Object.prototype.toString.call(e) should be [object DOMException]. Was [object DOMCoreException].
+PASS Object.prototype.toString.call(e) is "[object DOMException]"
FAIL Object.prototype.toString.call(e.__proto__) should be [object DOMExceptionPrototype]. Was [object Object].
-FAIL e.constructor.toString() should be [object DOMExceptionConstructor]. Was function DOMCoreException() { [native code] }.
+FAIL e.constructor.toString() should be [object DOMExceptionConstructor]. Was function DOMException() { [native code] }.
PASS e.constructor is window.DOMException
PASS e.HIERARCHY_REQUEST_ERR is e.constructor.HIERARCHY_REQUEST_ERR
PASS e.HIERARCHY_REQUEST_ERR is 3
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt
index 3afbba2..64c6046 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/DOMException/prototype-object-expected.txt
@@ -4,9 +4,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
PASS e.toString() is "Error: HIERARCHY_REQUEST_ERR: DOM Exception 3"
-FAIL Object.prototype.toString.call(e) should be [object DOMException]. Was [object DOMCoreException].
+PASS Object.prototype.toString.call(e) is "[object DOMException]"
FAIL Object.prototype.toString.call(e.__proto__) should be [object DOMExceptionPrototype]. Was [object Object].
-FAIL e.constructor.toString() should be [object DOMExceptionConstructor]. Was function DOMCoreException() { [native code] }.
+FAIL e.constructor.toString() should be [object DOMExceptionConstructor]. Was function DOMException() { [native code] }.
PASS e.constructor is window.DOMException
PASS e.HIERARCHY_REQUEST_ERR is e.constructor.HIERARCHY_REQUEST_ERR
PASS e.HIERARCHY_REQUEST_ERR is 3