summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt4
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
3 files changed, 4 insertions, 7 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt
index 5b9d511..f753e56 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Window/window-lookup-precedence-expected.txt
@@ -102,8 +102,8 @@ PASS 'function Comment() { [native code] }' is 'function Comment() { [native cod
PASS 'function Comment() { [native code] }' is 'function Comment() { [native code] }'
PASS 'function Counter() { [native code] }' is 'function Counter() { [native code] }'
PASS 'function Counter() { [native code] }' is 'function Counter() { [native code] }'
-PASS 'function DOMCoreException() { [native code] }' is 'function DOMCoreException() { [native code] }'
-PASS 'function DOMCoreException() { [native code] }' is 'function DOMCoreException() { [native code] }'
+PASS 'function DOMException() { [native code] }' is 'function DOMException() { [native code] }'
+PASS 'function DOMException() { [native code] }' is 'function DOMException() { [native code] }'
PASS 'function DOMImplementation() { [native code] }' is 'function DOMImplementation() { [native code] }'
PASS 'function DOMImplementation() { [native code] }' is 'function DOMImplementation() { [native code] }'
PASS 'function DOMParser() { [native code] }' is 'function DOMParser() { [native code] }'
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
index 994d686..b0db30a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/security/cross-frame-access-put-expected.txt
@@ -391,7 +391,7 @@ ALERT: PASS: window.CSSValue should be 'function CSSValue() { [native code] }' a
ALERT: PASS: window.Document should be 'function Document() { [native code] }' and is.
ALERT: PASS: window.DocumentFragment should be 'function DocumentFragment() { [native code] }' and is.
ALERT: PASS: window.DocumentType should be 'function DocumentType() { [native code] }' and is.
-ALERT: PASS: window.DOMException should be 'function DOMCoreException() { [native code] }' and is.
+ALERT: PASS: window.DOMException should be 'function DOMException() { [native code] }' and is.
ALERT: PASS: window.DOMImplementation should be 'function DOMImplementation() { [native code] }' and is.
ALERT: PASS: window.DOMParser should be 'function DOMParser() { [native code] }' and is.
ALERT: PASS: window.Element should be 'function Element() { [native code] }' and is.
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 686f22f..3d4c5ea 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2716,9 +2716,6 @@ BUG32398 RELEASE MAC : svg/custom/resource-invalidate-on-target-update.svg = IMA
BUG32308 DEBUG : fast/frames/cached-frame-counter.html = TIMEOUT
-// WebKit roll: 53290:53313
-BUG32339 LINUX : fast/dom/Window/window-lookup-precedence.html = TEXT PASS
-
// New flakyness ?
BUG32306 MAC DEBUG: svg/hixie/error/004.xml = CRASH PASS
@@ -2909,4 +2906,4 @@ BUG23482 : svg/text/text-ws-02-t.svg = FAIL
BUG23482 : svg/text/textPathBoundsBug.svg = FAIL
BUG29344 : svg/text/text-text-07-t.svg = FAIL
-BUG37248 LINUX : svg/W3C-SVG-1.1/filters-displace-01-f.svg = IMAGE+TEXT PASS TEXT \ No newline at end of file
+BUG37248 LINUX : svg/W3C-SVG-1.1/filters-displace-01-f.svg = IMAGE+TEXT PASS TEXT