summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 07:05:29 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 07:05:29 +0000
commitd3438bf3af517bb8d40fc070213fc735c5c45408 (patch)
tree84d329e655821dc7344b615de040267581b5d91c /webkit
parent81058d3e2276e5f490660f55e185b46ab1b1f21b (diff)
downloadchromium_src-d3438bf3af517bb8d40fc070213fc735c5c45408.zip
chromium_src-d3438bf3af517bb8d40fc070213fc735c5c45408.tar.gz
chromium_src-d3438bf3af517bb8d40fc070213fc735c5c45408.tar.bz2
Don't let file:// URLs script Web URLs.
BUG=7986 R=finnur Review URL: http://codereview.chromium.org/39141 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/cleared-by-relayout-expected.txt6
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/inactive-selection-expected.txt6
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Element/offsetLeft-offsetTop-body-quirk-expected.txt6
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Element/offsetLeft-offsetTop-html-expected.txt5
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt28
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clone-contents-0-end-offset-expected.txt1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/wrapper-classes-expected.txt34
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/char-decoding-expected.txt158
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.pngbin4780 -> 3866 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.txt9
-rw-r--r--webkit/glue/webview_impl.cc4
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_ignored.txt9
14 files changed, 249 insertions, 21 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/cleared-by-relayout-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/cleared-by-relayout-expected.txt
new file mode 100755
index 0000000..2124813
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/cleared-by-relayout-expected.txt
@@ -0,0 +1,6 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<body contenteditable> from frame with URL cleared-by-relayout.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<body contenteditable> from frame with URL cleared-by-relayout.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 16: Uncaught TypeError: Object [object global] has no method 'getSelection'
+Test for http://bugs.webkit.org/show_bug.cgi?id=15942 REGRESSION: Selecting "Edit Html" tab in Blogger causes crash (Assertion failed: isRange()).
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/inactive-selection-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/inactive-selection-expected.txt
new file mode 100755
index 0000000..83ded32
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/selection/inactive-selection-expected.txt
@@ -0,0 +1,6 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html, <div id='input' contenteditable='true'>should be an inactive selection</div> from frame with URL inactive-selection.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 15: Uncaught TypeError: Cannot call method 'getElementById' of undefined
+This test verifies that an editable element in one frame retains an inactive selection after you've made a selection in another frame.
+
+
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Element/offsetLeft-offsetTop-body-quirk-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Element/offsetLeft-offsetTop-body-quirk-expected.txt
new file mode 100755
index 0000000..e229a0d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Element/offsetLeft-offsetTop-body-quirk-expected.txt
@@ -0,0 +1,6 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html, <body style="padding: 9px; margin: 10px; outline: thin solid blue;"> <div id="target" style="padding: 6px; margin: 8px; outline: thin solid green;"></div> </body> from frame with URL offsetLeft-offsetTop-body-quirk.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 13: Uncaught TypeError: Cannot call method 'getElementById' of undefined
+
+
+
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Element/offsetLeft-offsetTop-html-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Element/offsetLeft-offsetTop-html-expected.txt
new file mode 100755
index 0000000..5dad070
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/Element/offsetLeft-offsetTop-html-expected.txt
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html, <html id="target"></html> from frame with URL offsetLeft-offsetTop-html.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 13: Uncaught TypeError: Cannot call method 'getElementById' of undefined
+
+
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt
new file mode 100755
index 0000000..9c97138
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/object-as-frame-expected.txt
@@ -0,0 +1,28 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Old contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,New contents of frame from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of iframe from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,Updated contents of object from frame with URL object-as-frame.html. Domains, protocols and ports must match.
+
+PASS window.frames.length is 2
+FAIL window.frames[0].frameElement.name should be frame. Threw exception TypeError: Cannot read property 'name' of undefined
+FAIL window.frames[1].frameElement.name should be obj. Threw exception TypeError: Cannot read property 'name' of undefined
+Loading 'data:text/html,Updated contents of iframe' in iframe...
+Loading 'data:text/html,Updated contents of object' in object...
+FAIL window.frames[0].location.toString() should be data:text/html,Updated contents of iframe. Threw exception TypeError: Property 'toString' of object #<error> is not a function
+FAIL window.frames[1].location.toString() should be data:text/html,Updated contents of object. Threw exception TypeError: Property 'toString' of object #<error> is not a function
+
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
index 312e509..1daa599 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved-expected.txt
@@ -1,3 +1,5 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html, <!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0//EN' 'http://www.w3.org/TR/html4/strict.dtd'><html></html> from frame with URL clientWidthAfterDocumentIsRemoved.html. Domains, protocols and ports must match.
+
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clone-contents-0-end-offset-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clone-contents-0-end-offset-expected.txt
index bd9f7c5..7e9194f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clone-contents-0-end-offset-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/clone-contents-0-end-offset-expected.txt
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: line 13: Uncaught TypeError: Cannot read property 'documentElement' of undefined
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/wrapper-classes-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/wrapper-classes-expected.txt
index e1663c5..e2c6275 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/wrapper-classes-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/wrapper-classes-expected.txt
@@ -1,3 +1,5 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:application/xhtml+xml,<?xml version='1.0' encoding='UTF-8'?><body/> from frame with URL wrapper-classes.html. Domains, protocols and ports must match.
+
This tests wrapper class names for JavaScript.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
@@ -38,21 +40,21 @@ FAIL jsWrapperClass(document.createTreeWalker(root, 0, null, false).constructor)
XML
-PASS jsWrapperClass(xmlDocument) is 'Document'
-FAIL jsWrapperClass(xmlDocument.__proto__) should be DocumentPrototype. Was Object.
-FAIL jsWrapperClass(xmlDocument.constructor) should be DocumentConstructor. Was Function.
-PASS jsWrapperClass(xmlDocument.createCDATASection()) is 'CDATASection'
-FAIL jsWrapperClass(xmlDocument.createCDATASection().__proto__) should be CDATASectionPrototype. Was Object.
-FAIL jsWrapperClass(xmlDocument.createCDATASection().constructor) should be CDATASectionConstructor. Was Function.
-PASS jsWrapperClass(xmlDocument.createElementNS('x', 'x', 'x')) is 'Element'
-FAIL jsWrapperClass(xmlDocument.createElementNS('x', 'x', 'x').__proto__) should be ElementPrototype. Was Object.
-FAIL jsWrapperClass(xmlDocument.createElementNS('x', 'x', 'x').constructor) should be ElementConstructor. Was Function.
-PASS jsWrapperClass(xmlDocument.createEntityReference()) is 'EntityReference'
-FAIL jsWrapperClass(xmlDocument.createEntityReference().__proto__) should be EntityReferencePrototype. Was Object.
-FAIL jsWrapperClass(xmlDocument.createEntityReference().constructor) should be EntityReferenceConstructor. Was Function.
-PASS jsWrapperClass(xmlDocument.createProcessingInstruction()) is 'ProcessingInstruction'
-FAIL jsWrapperClass(xmlDocument.createProcessingInstruction().__proto__) should be ProcessingInstructionPrototype. Was Object.
-FAIL jsWrapperClass(xmlDocument.createProcessingInstruction().constructor) should be ProcessingInstructionConstructor. Was Function.
+FAIL jsWrapperClass(xmlDocument) should be Document. Was [null].
+FAIL jsWrapperClass(xmlDocument.__proto__) should be DocumentPrototype. Threw exception TypeError: Cannot read property '__proto__' of undefined
+FAIL jsWrapperClass(xmlDocument.constructor) should be DocumentConstructor. Threw exception TypeError: Cannot read property 'constructor' of undefined
+FAIL jsWrapperClass(xmlDocument.createCDATASection()) should be CDATASection. Threw exception TypeError: Cannot call method 'createCDATASection' of undefined
+FAIL jsWrapperClass(xmlDocument.createCDATASection().__proto__) should be CDATASectionPrototype. Threw exception TypeError: Cannot call method 'createCDATASection' of undefined
+FAIL jsWrapperClass(xmlDocument.createCDATASection().constructor) should be CDATASectionConstructor. Threw exception TypeError: Cannot call method 'createCDATASection' of undefined
+FAIL jsWrapperClass(xmlDocument.createElementNS('x', 'x', 'x')) should be Element. Threw exception TypeError: Cannot call method 'createElementNS' of undefined
+FAIL jsWrapperClass(xmlDocument.createElementNS('x', 'x', 'x').__proto__) should be ElementPrototype. Threw exception TypeError: Cannot call method 'createElementNS' of undefined
+FAIL jsWrapperClass(xmlDocument.createElementNS('x', 'x', 'x').constructor) should be ElementConstructor. Threw exception TypeError: Cannot call method 'createElementNS' of undefined
+FAIL jsWrapperClass(xmlDocument.createEntityReference()) should be EntityReference. Threw exception TypeError: Cannot call method 'createEntityReference' of undefined
+FAIL jsWrapperClass(xmlDocument.createEntityReference().__proto__) should be EntityReferencePrototype. Threw exception TypeError: Cannot call method 'createEntityReference' of undefined
+FAIL jsWrapperClass(xmlDocument.createEntityReference().constructor) should be EntityReferenceConstructor. Threw exception TypeError: Cannot call method 'createEntityReference' of undefined
+FAIL jsWrapperClass(xmlDocument.createProcessingInstruction()) should be ProcessingInstruction. Threw exception TypeError: Cannot call method 'createProcessingInstruction' of undefined
+FAIL jsWrapperClass(xmlDocument.createProcessingInstruction().__proto__) should be ProcessingInstructionPrototype. Threw exception TypeError: Cannot call method 'createProcessingInstruction' of undefined
+FAIL jsWrapperClass(xmlDocument.createProcessingInstruction().constructor) should be ProcessingInstructionConstructor. Threw exception TypeError: Cannot call method 'createProcessingInstruction' of undefined
Events
@@ -457,4 +459,4 @@ FAIL tagJSWrapperPrototypeClass('wbr') should be HTMLElementPrototype. Was Objec
FAIL tagJSWrapperConstructorClass('wbr') should be HTMLElementConstructor. Was Function.
PASS tagJSWrapperClass('xmp') is 'HTMLPreElement'
FAIL tagJSWrapperPrototypeClass('xmp') should be HTMLPreElementPrototype. Was Object.
-FAIL tagJSWrapperConstructorClass('xmp') should be HTMLPreElementConstructor. Was Function. \ No newline at end of file
+FAIL tagJSWrapperConstructorClass('xmp') should be HTMLPreElementConstructor. Was Function.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/char-decoding-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/char-decoding-expected.txt
new file mode 100755
index 0000000..69ac9c9
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/encoding/char-decoding-expected.txt
@@ -0,0 +1,158 @@
+This tests decoding characters in various character sets.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+FAIL decode('UTF-8', '%E2%88%9A') should be U+221A. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('gb2312', '%A3%A0') should be U+3000. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('gb_2312-80', '%A3%A0') should be U+3000. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('chinese', '%A3%A0') should be U+3000. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('gbk', '%A3%A0') should be U+3000. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('gb18030', '%A3%A0') should be U+3000. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-CN', '%A3%A0') should be U+3000. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%A2%E6') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%A1%A4') should be U+00B7. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%A1%A9') should be U+00AD. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%A1%AA') should be U+2015. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%A1%AD') should be U+223C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%A2%A6') should be U+FF5E. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%A2%C1') should be U+2299. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%1A') should be U+001A. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%1C') should be U+001C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%8F%A1') should be U+B8EA. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%B4%D3') should be U+B2D2. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('korean', '%A2%41') should be U+C910. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%A2%E6') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%A1%A4') should be U+00B7. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%A1%A9') should be U+00AD. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%A1%AA') should be U+2015. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%A1%AD') should be U+223C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%A2%A6') should be U+FF5E. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%A2%C1') should be U+2299. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%1A') should be U+001A. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%1C') should be U+001C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%8F%A1') should be U+B8EA. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%B4%D3') should be U+B2D2. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('EUC-KR', '%A2%41') should be U+C910. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%A2%E6') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%A1%A4') should be U+00B7. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%A1%A9') should be U+00AD. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%A1%AA') should be U+2015. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%A1%AD') should be U+223C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%A2%A6') should be U+FF5E. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%A2%C1') should be U+2299. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%1A') should be U+001A. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%1C') should be U+001C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%8F%A1') should be U+B8EA. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%B4%D3') should be U+B2D2. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-949', '%A2%41') should be U+C910. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%A2%E6') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%A1%A4') should be U+00B7. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%A1%A9') should be U+00AD. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%A1%AA') should be U+2015. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%A1%AD') should be U+223C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%A2%A6') should be U+FF5E. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%A2%C1') should be U+2299. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%1A') should be U+001A. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%1C') should be U+001C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%8F%A1') should be U+B8EA. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%B4%D3') should be U+B2D2. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-windows-949', '%A2%41') should be U+C910. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%A2%E6') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%A1%A4') should be U+00B7. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%A1%A9') should be U+00AD. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%A1%AA') should be U+2015. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%A1%AD') should be U+223C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%A2%A6') should be U+FF5E. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%A2%C1') should be U+2299. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%1A') should be U+001A. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%1C') should be U+001C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%8F%A1') should be U+B8EA. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%B4%D3') should be U+B2D2. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('x-uhc', '%A2%41') should be U+C910. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%A2%E6') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%A1%A4') should be U+00B7. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%A1%A9') should be U+00AD. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%A1%AA') should be U+2015. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%A1%AD') should be U+223C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%A2%A6') should be U+FF5E. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%A2%C1') should be U+2299. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%1A') should be U+001A. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%1C') should be U+001C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%8F%A1') should be U+B8EA. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%B4%D3') should be U+B2D2. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-ir-149', '%A2%41') should be U+C910. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%A2%E6') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%A1%A4') should be U+00B7. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%A1%A9') should be U+00AD. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%A1%AA') should be U+2015. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%A1%AD') should be U+223C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%A2%A6') should be U+FF5E. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%A2%C1') should be U+2299. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%1A') should be U+001A. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%1C') should be U+001C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%8F%A1') should be U+B8EA. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%B4%D3') should be U+B2D2. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1987', '%A2%41') should be U+C910. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%A2%E6') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%A1%A4') should be U+00B7. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%A1%A9') should be U+00AD. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%A1%AA') should be U+2015. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%A1%AD') should be U+223C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%A2%A6') should be U+FF5E. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%A2%C1') should be U+2299. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%1A') should be U+001A. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%1C') should be U+001C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%8F%A1') should be U+B8EA. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%B4%D3') should be U+B2D2. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KS_C_5601-1989', '%A2%41') should be U+C910. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-8859-9', '%80') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-8859-9', '%9F') should be U+0178. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-8859-9', '%FD') should be U+0131. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('latin5', '%80') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('latin5', '%9F') should be U+0178. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('latin5', '%FD') should be U+0131. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1254', '%80') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1254', '%9F') should be U+0178. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1254', '%FD') should be U+0131. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('ISO-8859-13', '%A1') should be U+201D. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('ISO-8859-13', '%A5') should be U+201E. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('ISO-8859-13', '%B4') should be U+201C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('ISO-8859-13', '%FF') should be U+2019. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1257', '%80') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1257', '%B4') should be U+00B4. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1257', '%FF') should be U+02D9. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-8859-7', '%A1') should be U+2018. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-8859-7', '%B5') should be U+0385. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('iso-8859-7', '%B6') should be U+0386. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1253', '%80') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1253', '%A1') should be U+0385. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1253', '%B5') should be U+00B5. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-1253', '%B6') should be U+00B6. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KOI8-R', '%A4') should be U+2553. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KOI8-R', '%AD') should be U+255C. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KOI8-U', '%A4') should be U+0454. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('KOI8-U', '%AD') should be U+0491. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('TIS-620', '%80') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('TIS-620', '%96') should be U+2013. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('TIS-620', '%A0') should be U+00A0. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('TIS-620', '%A1') should be U+0E01. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('TIS-620', '%DB') should be U+F8C1. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('ISO-8859-11', '%80') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('ISO-8859-11', '%96') should be U+2013. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('ISO-8859-11', '%A0') should be U+00A0. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('ISO-8859-11', '%A1') should be U+0E01. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('ISO-8859-11', '%DB') should be U+F8C1. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-874', '%80') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-874', '%96') should be U+2013. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-874', '%A0') should be U+00A0. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-874', '%A1') should be U+0E01. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('windows-874', '%DB') should be U+F8C1. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('dos-874', '%80') should be U+20AC. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('dos-874', '%96') should be U+2013. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('dos-874', '%A0') should be U+00A0. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('dos-874', '%A1') should be U+0E01. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+FAIL decode('dos-874', '%DB') should be U+F8C1. Threw exception Error: NETWORK_ERR: XMLHttpRequest Exception 101
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.checksum
index 0ac6219..e3390ab 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.checksum
@@ -1 +1 @@
-faf27f6924fe3411f3275fa7b12f489c \ No newline at end of file
+262c4c8c38d62c2b02f3ebd72258146c \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.png
index 27222a4..01b7e85 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.txt
index 4effcb0..89ec4d6 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/frame-src-attribute-expected.txt
@@ -1,3 +1,6 @@
+CONSOLE MESSAGE: line 1: Unsafe JavaScript attempt to access frame with URL data:text/html,<p>This test checks whether a frame element's 'src' attribute is a complete, rather than relative, URL.</p><pre id='console'></pre> from frame with URL frame-src-attribute.html. Domains, protocols and ports must match.
+
+CONSOLE MESSAGE: line 6: Uncaught TypeError: Cannot call method 'getElementById' of undefined
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
@@ -8,13 +11,11 @@ layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x579
+ RenderBody {BODY} at (8,8) size 784x576
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 581x19
text run at (0,0) width 581: "This test checks whether a frame element's 'src' attribute is a complete, rather than relative, URL."
- RenderBlock {PRE} at (0,36) size 784x16
- RenderText {#text} at (0,0) size 624x16
- text run at (0,0) width 624: "PASS: Frame 'src' attribute should include 'LayoutTests/fast/frames' and does."
+ RenderBlock {PRE} at (0,36) size 784x0
RenderFrame {FRAME} at (0,0) size 0x0
layer at (0,0) size 8x8
RenderView at (0,0) size 0x0
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index 4b62711..0d05a2b 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1312,6 +1312,10 @@ void WebViewImpl::SetPreferences(const WebPreferences& preferences) {
// Turn this on to cause WebCore to paint the resize corner for us.
settings->setShouldPaintCustomScrollbars(true);
+ // Mitigate attacks from local HTML files by not granting file:// URLs
+ // universal access.
+ settings->setAllowUniversalAccessFromFileURLs(false);
+
#if defined(OS_WIN)
// RenderTheme is a singleton that needs to know the default font size to
// draw some form controls. We let it know each time the size changes.
diff --git a/webkit/tools/layout_tests/test_lists/tests_ignored.txt b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
index 950693c..df21cd1 100644
--- a/webkit/tools/layout_tests/test_lists/tests_ignored.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
@@ -38,6 +38,15 @@ SKIP : LayoutTests/http/tests/wml = FAIL
// most likely these tests will always be JSC specific.
SKIP : LayoutTests/fast/profiler = FAIL TIMEOUT
+// These tests depend on a bogus assumption that file:// URLs have universal
+// access to other URLs. This isn't true for us.
+SKIP : LayoutTests/editing/selection/drag-in-iframe.html = TIMEOUT
+SKIP : LayoutTests/fast/dom/gc-6.html = TIMEOUT
+SKIP : LayoutTests/fast/dom/gc-7.html = TIMEOUT
+SKIP : LayoutTests/fast/frames/frame-set-same-location.html = TIMEOUT
+SKIP : LayoutTests/fast/frames/frame-set-same-src.html = TIMEOUT
+SKIP : LayoutTests/fast/frames/hover-timer-crash.html = TIMEOUT
+
// This test doesn't terminate because it contains exponential
// regexps. It is safe to disable because we run the same tests
// (sans the nonterminating ones) as part of the v8 tests.