Remove the Document.charset setter (making it readonly)

Intent to Remove:
https://groups.google.com/a/chromium.org/d/msg/blink-dev/vr1RANmrniU/oWAoayNP74QJ

HTMLFormControlElementTest and HTMLSelectElementTest don't actually need
to call Document::setCharset(), as they use APIs where the text has
already been decoded from UTF-8.

BUG=438392

Review URL: https://codereview.chromium.org/1145773003

git-svn-id: svn://svn.chromium.org/blink/trunk@195617 bbb929c8-8fbe-4397-9dbb-9b2b20218538

4 files changed, 10 insertions, 41 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>&nbsp;document.defaultCharset: " + (document.defaultCharset ?
 document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>"); // Firefox
 document.write("<p>&nbsp;document.inputEncoding: " + document.inputEncoding + "</p>"); // DOM3
 
-document.write("<p>Setting charset to UTF-8...</p>");
-try {
-    document.charset = "utf-8";
-    document.write("<p>&nbsp;document.charset: " + document.charset + "</p>");
-    document.write("<p>&nbsp;document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
-    document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>");
-    document.write("<p>&nbsp;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>&nbsp;document.charset: " + document.charset + "</p>");
-    document.write("<p>&nbsp;document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
-    document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>");
-    document.write("<p>&nbsp;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>&nbsp;document.charset: " + document.charset + "</p>");
+document.write("<p>&nbsp;document.defaultCharset: " + (document.defaultCharset ? "defined" : "undefined") + "</p>");
+document.write("<p>&nbsp;document.characterSet: " + document.characterSet + "</p>");
+document.write("<p>&nbsp;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();
 }