<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[31483] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/31483">31483</a></dd>
<dt>Author</dt> <dd>jchaffraix@webkit.org</dd>
<dt>Date</dt> <dd>2008-03-31 14:58:43 -0700 (Mon, 31 Mar 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>2008-03-31 Julien Chaffraix <jchaffraix@webkit.org>
Reviewed by Darin.
Bug 18177: m_encoding is used twice in XMLHttpRequest
http://bugs.webkit.org/show_bug.cgi?id=18177
- Change XMLHttpRequest variable m_encoding to m_responseEncoding.
- Change send local variable m_encoding to encoding.
No test case (no functionnal change).
* platform/network/ResourceResponseBase.h: Removed unused variable.
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::send): Changed local m_encoding to encoding.
(WebCore::XMLHttpRequest::didReceiveResponse): m_encoding -> m_responseEncoding.
(WebCore::XMLHttpRequest::didReceiveData): Ditto.
* xml/XMLHttpRequest.h: Change m_encoding to m_responseEncoding to disambiguate
the name as it is only used for response.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformnetworkResourceResponseBaseh">trunk/WebCore/platform/network/ResourceResponseBase.h</a></li>
<li><a href="#trunkWebCorexmlXMLHttpRequestcpp">trunk/WebCore/xml/XMLHttpRequest.cpp</a></li>
<li><a href="#trunkWebCorexmlXMLHttpRequesth">trunk/WebCore/xml/XMLHttpRequest.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (31482 => 31483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2008-03-31 21:45:49 UTC (rev 31482)
+++ trunk/WebCore/ChangeLog 2008-03-31 21:58:43 UTC (rev 31483)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2008-03-31 Julien Chaffraix <jchaffraix@webkit.org>
+
+ Reviewed by Darin.
+
+ Bug 18177: m_encoding is used twice in XMLHttpRequest
+ http://bugs.webkit.org/show_bug.cgi?id=18177
+
+ - Change XMLHttpRequest variable m_encoding to m_responseEncoding.
+
+ - Change send local variable m_encoding to encoding.
+
+ No test case (no functionnal change).
+
+ * platform/network/ResourceResponseBase.h: Removed unused variable.
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::send): Changed local m_encoding to encoding.
+ (WebCore::XMLHttpRequest::didReceiveResponse): m_encoding -> m_responseEncoding.
+ (WebCore::XMLHttpRequest::didReceiveData): Ditto.
+ * xml/XMLHttpRequest.h: Change m_encoding to m_responseEncoding to disambiguate
+ the name as it is only used for response.
+
</ins><span class="cx"> 2008-03-27 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><span class="cx"> Pass the right ExecStates to toJS when creating JS wrappers for
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/ResourceResponseBase.h (31482 => 31483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/ResourceResponseBase.h 2008-03-31 21:45:49 UTC (rev 31482)
+++ trunk/WebCore/platform/network/ResourceResponseBase.h 2008-03-31 21:58:43 UTC (rev 31483)
</span><span class="lines">@@ -79,8 +79,6 @@
</span><span class="cx">
</span><span class="cx"> static bool compare(const ResourceResponse& a, const ResourceResponse& b);
</span><span class="cx">
</span><del>- const ResourceResponse& asResourceResponse() const;
-
</del><span class="cx"> protected:
</span><span class="cx"> ResourceResponseBase()
</span><span class="cx"> : m_expectedContentLength(0)
</span></span></pre></div>
<a id="trunkWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/xml/XMLHttpRequest.cpp (31482 => 31483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/xml/XMLHttpRequest.cpp 2008-03-31 21:45:49 UTC (rev 31482)
+++ trunk/WebCore/xml/XMLHttpRequest.cpp 2008-03-31 21:58:43 UTC (rev 31483)
</span><span class="lines">@@ -420,10 +420,10 @@
</span><span class="cx"> // FIXME: must use xmlEncoding for documents.
</span><span class="cx"> String charset = "UTF-8";
</span><span class="cx">
</span><del>- TextEncoding m_encoding(charset);
- if (!m_encoding.isValid()) // FIXME: report an error?
- m_encoding = UTF8Encoding();
- request.setHTTPBody(FormData::create(m_encoding.encode(body.characters(), body.length(), EntitiesForUnencodables)));
</del><ins>+ TextEncoding encoding(charset);
+ if (!encoding.isValid()) // FIXME: report an error?
+ encoding = UTF8Encoding();
+ request.setHTTPBody(FormData::create(encoding.encode(body.characters(), body.length(), EntitiesForUnencodables)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_requestHeaders.size() > 0)
</span><span class="lines">@@ -720,9 +720,9 @@
</span><span class="cx"> void XMLHttpRequest::didReceiveResponse(SubresourceLoader*, const ResourceResponse& response)
</span><span class="cx"> {
</span><span class="cx"> m_response = response;
</span><del>- m_encoding = extractCharsetFromMediaType(m_mimeTypeOverride);
- if (m_encoding.isEmpty())
- m_encoding = response.textEncodingName();
</del><ins>+ m_responseEncoding = extractCharsetFromMediaType(m_mimeTypeOverride);
+ if (m_responseEncoding.isEmpty())
+ m_responseEncoding = response.textEncodingName();
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -737,8 +737,8 @@
</span><span class="cx"> changeState(Sent);
</span><span class="cx">
</span><span class="cx"> if (!m_decoder) {
</span><del>- if (!m_encoding.isEmpty())
- m_decoder = new TextResourceDecoder("text/plain", m_encoding);
</del><ins>+ if (!m_responseEncoding.isEmpty())
+ m_decoder = new TextResourceDecoder("text/plain", m_responseEncoding);
</ins><span class="cx"> // allow TextResourceDecoder to look inside the m_response if it's XML or HTML
</span><span class="cx"> else if (responseIsXML())
</span><span class="cx"> m_decoder = new TextResourceDecoder("application/xml");
</span></span></pre></div>
<a id="trunkWebCorexmlXMLHttpRequesth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/xml/XMLHttpRequest.h (31482 => 31483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/xml/XMLHttpRequest.h 2008-03-31 21:45:49 UTC (rev 31482)
+++ trunk/WebCore/xml/XMLHttpRequest.h 2008-03-31 21:58:43 UTC (rev 31483)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> XMLHttpRequestState m_state;
</span><span class="cx">
</span><span class="cx"> ResourceResponse m_response;
</span><del>- String m_encoding;
</del><ins>+ String m_responseEncoding;
</ins><span class="cx">
</span><span class="cx"> RefPtr<TextResourceDecoder> m_decoder;
</span><span class="cx"> unsigned long m_identifier;
</span></span></pre>
</div>
</div>
</body>
</html>