<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170960] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170960">170960</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-10 03:09:41 -0700 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[XHR] overrideMimeType() should be able to change encoding in HEADERS RECEIVED state
https://bugs.webkit.org/show_bug.cgi?id=128968
Patch by Youenn Fablet <youenn.fablet@crf.canon.fr> on 2014-07-10
Reviewed by Alexey Proskuryakov.
Source/WebCore:
Moved response encoding computation from didReceiveResponse to didReceiveData, just before the decoder is instantiated.
This allows overrideMimeType to be changed within readystatechange event callback and have an impact on selected encoding.
Test: http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis.html
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::didReceiveResponse): Removed m_responseEncoding computation from response and mimeTypeOverride.
(WebCore::XMLHttpRequest::didReceiveData): Added m_responseEncoding computation from response and mimeTypeOverride.
LayoutTests:
Added test equivalent to http://w3c-test.org/web-platform-tests/master/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm
The test sets overrideMimeType when xhr state is changed to HEADERS RECEIVED.
* http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis-expected.txt: Added.
* http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis.html: Added.
* http/tests/xmlhttprequest/resources/get-content.php: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestoverridemimetypeheadersreceivedstateforceshiftjisexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestoverridemimetypeheadersreceivedstateforceshiftjishtml">trunk/LayoutTests/http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestresourcesgetcontentphp">trunk/LayoutTests/http/tests/xmlhttprequest/resources/get-content.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (170959 => 170960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-10 06:35:08 UTC (rev 170959)
+++ trunk/LayoutTests/ChangeLog 2014-07-10 10:09:41 UTC (rev 170960)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-07-10 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [XHR] overrideMimeType() should be able to change encoding in HEADERS RECEIVED state
+ https://bugs.webkit.org/show_bug.cgi?id=128968
+
+ Reviewed by Alexey Proskuryakov.
+
+ Added test equivalent to http://w3c-test.org/web-platform-tests/master/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm
+ The test sets overrideMimeType when xhr state is changed to HEADERS RECEIVED.
+
+ * http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis-expected.txt: Added.
+ * http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis.html: Added.
+ * http/tests/xmlhttprequest/resources/get-content.php: Added.
+
</ins><span class="cx"> 2014-07-08 Jeffrey Pfau <jpfau@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix flaky loading tests
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestoverridemimetypeheadersreceivedstateforceshiftjisexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis-expected.txt (0 => 170960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis-expected.txt 2014-07-10 10:09:41 UTC (rev 170960)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS XMLHttpRequest: overrideMimeType() in HEADERS RECEIVED state, enforcing Shift-JIS encoding
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestoverridemimetypeheadersreceivedstateforceshiftjishtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis.html (0 => 170960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis.html (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis.html 2014-07-10 10:09:41 UTC (rev 170960)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <title>XMLHttpRequest: overrideMimeType() in HEADERS RECEIVED state, enforcing Shift-JIS encoding</title>
+ <meta charset="utf-8">
+ <script src="/js-test-resources/testharness.js"></script>
+ <script src="/js-test-resources/testharnessreport.js"></script>
+ <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-overridemimetype()-method" data-tested-assertations="/following::ol/li[1] /following::ol/li[4]" />
+ <!-- similar to http://w3c-test.org/XMLHttpRequest/overridemimetype-headers-received-state-force-shiftjis.htm -->
+ </head>
+ <body>
+ <div id="log"></div>
+ <script>
+ var test = async_test();
+ var client = new XMLHttpRequest();
+ var readyState2Reached = false;
+ client.onreadystatechange = test.step_func( function() {
+ if(client.readyState===2){
+ readyState2Reached = true;
+ try{
+ client.overrideMimeType('text/plain;charset=Shift-JIS');
+ }catch(e){
+ assert_unreached('overrideMimeType should not throw in state 2');
+ }
+ }
+ if (client.readyState !== 4) return;
+ assert_equals( readyState2Reached, true, "readyState = 2 event fired" );
+ assert_equals( client.responseText, 'ใในใ', 'overrideMimeType() in HEADERS RECEIVED state set encoding' );
+ test.done();
+ });
+ client.open("GET", "resources/get-content.php?type="+encodeURIComponent('text/html;charset=UTF-8')+'&content=%83%65%83%58%83%67');
+ client.send( '' );
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestresourcesgetcontentphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/xmlhttprequest/resources/get-content.php (0 => 170960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/resources/get-content.php (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resources/get-content.php 2014-07-10 10:09:41 UTC (rev 170960)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<?php
+ $content = $_GET["content"] ? $_GET["content"] : "";
+ $type = $_GET["type"] ? $_GET["type"] : "";
+ header("HTTP/1.1 200 OK");
+ header("Content-Type:" . $type);
+
+ echo $content;
+ exit;
+?>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170959 => 170960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-10 06:35:08 UTC (rev 170959)
+++ trunk/Source/WebCore/ChangeLog 2014-07-10 10:09:41 UTC (rev 170960)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-07-10 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ [XHR] overrideMimeType() should be able to change encoding in HEADERS RECEIVED state
+ https://bugs.webkit.org/show_bug.cgi?id=128968
+
+ Reviewed by Alexey Proskuryakov.
+
+ Moved response encoding computation from didReceiveResponse to didReceiveData, just before the decoder is instantiated.
+ This allows overrideMimeType to be changed within readystatechange event callback and have an impact on selected encoding.
+
+ Test: http/tests/xmlhttprequest/overridemimetype-headers-received-state-force-shiftjis.html
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::didReceiveResponse): Removed m_responseEncoding computation from response and mimeTypeOverride.
+ (WebCore::XMLHttpRequest::didReceiveData): Added m_responseEncoding computation from response and mimeTypeOverride.
+
</ins><span class="cx"> 2014-07-09 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Fire connected/disconnected events for Gamepads.
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (170959 => 170960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-07-10 06:35:08 UTC (rev 170959)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-07-10 10:09:41 UTC (rev 170960)
</span><span class="lines">@@ -1128,13 +1128,8 @@
</span><span class="cx"> InspectorInstrumentation::didReceiveXHRResponse(scriptExecutionContext(), identifier);
</span><span class="cx">
</span><span class="cx"> m_response = response;
</span><del>- if (!m_mimeTypeOverride.isEmpty()) {
</del><ins>+ if (!m_mimeTypeOverride.isEmpty())
</ins><span class="cx"> m_response.setHTTPHeaderField(HTTPHeaderName::ContentType, m_mimeTypeOverride);
</span><del>- m_responseEncoding = extractCharsetFromMediaType(m_mimeTypeOverride);
- }
-
- if (m_responseEncoding.isEmpty())
- m_responseEncoding = response.textEncodingName();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void XMLHttpRequest::didReceiveData(const char* data, int len)
</span><span class="lines">@@ -1145,6 +1140,12 @@
</span><span class="cx"> if (m_state < HEADERS_RECEIVED)
</span><span class="cx"> changeState(HEADERS_RECEIVED);
</span><span class="cx">
</span><ins>+ // FIXME: Should we update "Content-Type" header field with m_mimeTypeOverride value in case it has changed since didReceiveResponse?
+ if (!m_mimeTypeOverride.isEmpty())
+ m_responseEncoding = extractCharsetFromMediaType(m_mimeTypeOverride);
+ if (m_responseEncoding.isEmpty())
+ m_responseEncoding = m_response.textEncodingName();
+
</ins><span class="cx"> bool useDecoder = shouldDecodeResponse();
</span><span class="cx">
</span><span class="cx"> if (useDecoder && !m_decoder) {
</span></span></pre>
</div>
</div>
</body>
</html>