diff options
Diffstat (limited to 'third_party/WebKit/LayoutTests')
8 files changed, 10 insertions, 51 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Document/document-charset-expected.txt b/third_party/WebKit/LayoutTests/fast/dom/Document/document-charset-expected.txt index c4569e8..b76f473 100644 --- a/third_party/WebKit/LayoutTests/fast/dom/Document/document-charset-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/dom/Document/document-charset-expected.txt @@ -1,4 +1,3 @@ -CONSOLE WARNING: Setting 'Document.charset' is deprecated. Please use '<meta charset="UTF-8">' instead. Initial document.charset: KOI8-R @@ -9,22 +8,12 @@ Initial document.inputEncoding: KOI8-R -Setting charset to UTF-8... +Setting charset to UTF-8... (expected to have no effect) - document.charset: UTF-8 - - document.defaultCharset: defined - - document.characterSet: UTF-8 - - document.inputEncoding: UTF-8 - -Setting characterSet to KOI8-R (expected to fail, matching Firefox)... - - document.charset: UTF-8 + document.charset: KOI8-R document.defaultCharset: defined - document.characterSet: UTF-8 + document.characterSet: KOI8-R - document.inputEncoding: UTF-8 + document.inputEncoding: KOI8-R diff --git a/third_party/WebKit/LayoutTests/fast/dom/Document/document-charset.html b/third_party/WebKit/LayoutTests/fast/dom/Document/document-charset.html index fffc724..1594696 100644 --- a/third_party/WebKit/LayoutTests/fast/dom/Document/document-charset.html +++ b/third_party/WebKit/LayoutTests/fast/dom/Document/document-charset.html @@ -15,28 +15,12 @@ document.write("<p> document.defaultCharset: " + (document.defaultCharset ? document.write("<p> document.characterSet: " + document.characterSet + "</p>"); // Firefox document.write("<p> document.inputEncoding: " + document.inputEncoding + "</p>"); // DOM3 -document.write("<p>Setting charset to UTF-8...</p>"); -try { - document.charset = "utf-8"; - document.write("<p> document.charset: " + document.charset + "</p>"); - document.write("<p> document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>"); - document.write("<p> document.characterSet: " + document.characterSet + "</p>"); - document.write("<p> document.inputEncoding: " + document.inputEncoding + "</p>"); -} catch (ex) { - document.write("<p>Failure</p>"); -} - -// throws an exception in Firefox, but JavaScriptCore seems to silently ignore assignment to read-only properties -document.write("<p>Setting characterSet to KOI8-R (expected to fail, matching Firefox)...</p>"); -try { - document.characterSet = "KOI8-R"; - document.write("<p> document.charset: " + document.charset + "</p>"); - document.write("<p> document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>"); - document.write("<p> document.characterSet: " + document.characterSet + "</p>"); - document.write("<p> document.inputEncoding: " + document.inputEncoding + "</p>"); -} catch (ex) { - document.write("<p>Failure (expected)</p>"); -} +document.write("<p>Setting charset to UTF-8... (expected to have no effect)</p>"); +document.charset = "utf-8"; +document.write("<p> document.charset: " + document.charset + "</p>"); +document.write("<p> document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>"); +document.write("<p> document.characterSet: " + document.characterSet + "</p>"); +document.write("<p> document.inputEncoding: " + document.inputEncoding + "</p>"); </script> </body> diff --git a/third_party/WebKit/LayoutTests/fast/dom/frame-loading-via-document-write-expected.txt b/third_party/WebKit/LayoutTests/fast/dom/frame-loading-via-document-write-expected.txt index e1db80e..5b69cb1 100644 --- a/third_party/WebKit/LayoutTests/fast/dom/frame-loading-via-document-write-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/dom/frame-loading-via-document-write-expected.txt @@ -1,4 +1,3 @@ -CONSOLE WARNING: Setting 'Document.charset' is deprecated. Please use '<meta charset="UTF-8">' instead. -------- diff --git a/third_party/WebKit/LayoutTests/fast/dom/frame-loading-via-document-write.html b/third_party/WebKit/LayoutTests/fast/dom/frame-loading-via-document-write.html index bb10672..cfa8008 100644 --- a/third_party/WebKit/LayoutTests/fast/dom/frame-loading-via-document-write.html +++ b/third_party/WebKit/LayoutTests/fast/dom/frame-loading-via-document-write.html @@ -28,7 +28,6 @@ function buildFrameset() "</td></tr></table></body></html>"; frames['topRow'].document.open("text/html","replace"); - frames['topRow'].document.charset=document.charset; frames['topRow'].document.write(outHTML); frames['topRow'].document.close(); @@ -45,7 +44,6 @@ function buildFrameset() "</td></tr></table></body></html>"; frames['middleRow'].document.open("text/html","replace"); - frames['middleRow'].document.charset=document.charset; frames['middleRow'].document.write(outHTML); frames['middleRow'].document.close(); @@ -56,7 +54,6 @@ function buildFrameset() "</td></tr></table></body></html>"; frames['bottomRow'].document.open("text/html","replace"); - frames['bottomRow'].document.charset=document.charset; frames['bottomRow'].document.write(outHTML); frames['bottomRow'].document.close(); } diff --git a/third_party/WebKit/LayoutTests/fast/encoding/css-charset-default-expected.txt b/third_party/WebKit/LayoutTests/fast/encoding/css-charset-default-expected.txt index 1248b07..46ffa35 100644 --- a/third_party/WebKit/LayoutTests/fast/encoding/css-charset-default-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/encoding/css-charset-default-expected.txt @@ -1,4 +1,3 @@ -CONSOLE WARNING: Setting 'Document.charset' is deprecated. Please use '<meta charset="UTF-8">' instead. Test for bug 11011: External CSS is parsed as iso-8859-1 even though the main document is utf-8. Stylesheet 1 (inherit document charset using xml-stylesheet processing instruction): "SUССЕSS" @@ -8,5 +7,3 @@ Stylesheet 2 (inherit document charset using link): "SUССЕSS" Stylesheet 3 (inherit referring stylesheet charset): "SUССЕSS" Stylesheet 4 (inherit referring inline stylesheet charset): "SUССЕSS" - -Stylesheet 5 (inherit document charset using link after document.charset was set): "SUССЕSS" diff --git a/third_party/WebKit/LayoutTests/fast/encoding/css-charset-default.xhtml b/third_party/WebKit/LayoutTests/fast/encoding/css-charset-default.xhtml index 42484c85..67de026 100644 --- a/third_party/WebKit/LayoutTests/fast/encoding/css-charset-default.xhtml +++ b/third_party/WebKit/LayoutTests/fast/encoding/css-charset-default.xhtml @@ -10,8 +10,6 @@ <style type="text/css"> @import "css-charset-inherit-iso-8859-5.css?4"; </style> - <script>document.charset = "koi8-r";</script> - <link rel="stylesheet" type="text/css" href="css-charset-inherit-koi-8.css?2"/> </head> <body onload="test()"> <p>Test for <a href="http://bugs.webkit.org/show_bug.cgi?id=11011">bug 11011</a>: @@ -21,7 +19,6 @@ External CSS is parsed as iso-8859-1 even though the main document is utf-8.</p> <p id="res2">Stylesheet 2 (inherit document charset using link): </p> <p id="res3">Stylesheet 3 (inherit referring stylesheet charset): </p> <p id="res4">Stylesheet 4 (inherit referring inline stylesheet charset): </p> -<p id="res5">Stylesheet 5 (inherit document charset using link after document.charset was set): </p> <script type="text/javascript"> if (window.testRunner) @@ -36,8 +33,6 @@ function test() { document.getElementById("res3").innerHTML += document.styleSheets[2].cssRules[0].styleSheet.cssRules[0].style.content; document.getElementById("res4").innerHTML += document.styleSheets[3].cssRules[0].styleSheet.cssRules[0].style.content; - - document.getElementById("res5").innerHTML += document.styleSheets[4].cssRules[0].style.content; } catch (ex) { alert(ex.toString()); } diff --git a/third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt index ef69cf5..7a01574 100644 --- a/third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt +++ b/third_party/WebKit/LayoutTests/virtual/stable/webexposed/global-interface-listing-expected.txt @@ -880,7 +880,6 @@ interface Document method webkitCancelFullScreen method webkitExitFullscreen setter body - setter charset setter cookie setter designMode setter dir diff --git a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt index e7e86e5..2cb06d2 100644 --- a/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt +++ b/third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt @@ -1143,7 +1143,6 @@ interface Document method webkitCancelFullScreen method webkitExitFullscreen setter body - setter charset setter cookie setter designMode setter dir |