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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@31483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e3e08d9..31d4b7c 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+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.
+
 2008-03-27  Adam Roben  <aroben@apple.com>
 
         Pass the right ExecStates to toJS when creating JS wrappers for

diff --git a/WebCore/platform/network/ResourceResponseBase.h b/WebCore/platform/network/ResourceResponseBase.h
index 503156a..249b6c2 100644 (file)
--- a/WebCore/platform/network/ResourceResponseBase.h
+++ b/WebCore/platform/network/ResourceResponseBase.h
@@ -79,8 +79,6 @@ class ResourceResponseBase {
 
     static bool compare(const ResourceResponse& a, const ResourceResponse& b);
 
-    const ResourceResponse& asResourceResponse() const;
-
  protected:
     ResourceResponseBase()  
         : m_expectedContentLength(0)

diff --git a/WebCore/xml/XMLHttpRequest.cpp b/WebCore/xml/XMLHttpRequest.cpp
index 14295d6..bc27f28 100644 (file)
--- a/WebCore/xml/XMLHttpRequest.cpp
+++ b/WebCore/xml/XMLHttpRequest.cpp
@@ -420,10 +420,10 @@ void XMLHttpRequest::send(const String& body, ExceptionCode& ec)
         // FIXME: must use xmlEncoding for documents.
         String charset = "UTF-8";
       
-        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)));
+        TextEncoding encoding(charset);
+        if (!encoding.isValid()) // FIXME: report an error?
+            encoding = UTF8Encoding();
+        request.setHTTPBody(FormData::create(encoding.encode(body.characters(), body.length(), EntitiesForUnencodables)));
     }
 
     if (m_requestHeaders.size() > 0)
@@ -720,9 +720,9 @@ void XMLHttpRequest::willSendRequest(SubresourceLoader*, ResourceRequest& reques
 void XMLHttpRequest::didReceiveResponse(SubresourceLoader*, const ResourceResponse& response)
 {
     m_response = response;
-    m_encoding = extractCharsetFromMediaType(m_mimeTypeOverride);
-    if (m_encoding.isEmpty())
-        m_encoding = response.textEncodingName();
+    m_responseEncoding = extractCharsetFromMediaType(m_mimeTypeOverride);
+    if (m_responseEncoding.isEmpty())
+        m_responseEncoding = response.textEncodingName();
 
 }
 
@@ -737,8 +737,8 @@ void XMLHttpRequest::didReceiveData(SubresourceLoader*, const char* data, int le
         changeState(Sent);
   
     if (!m_decoder) {
-        if (!m_encoding.isEmpty())
-            m_decoder = new TextResourceDecoder("text/plain", m_encoding);
+        if (!m_responseEncoding.isEmpty())
+            m_decoder = new TextResourceDecoder("text/plain", m_responseEncoding);
         // allow TextResourceDecoder to look inside the m_response if it's XML or HTML
         else if (responseIsXML())
             m_decoder = new TextResourceDecoder("application/xml");

diff --git a/WebCore/xml/XMLHttpRequest.h b/WebCore/xml/XMLHttpRequest.h
index cd1b680..6163012 100644 (file)
--- a/WebCore/xml/XMLHttpRequest.h
+++ b/WebCore/xml/XMLHttpRequest.h
@@ -125,7 +125,7 @@ private:
     XMLHttpRequestState m_state;
 
     ResourceResponse m_response;
-    String m_encoding;
+    String m_responseEncoding;
 
     RefPtr<TextResourceDecoder> m_decoder;
     unsigned long m_identifier;