Changeset 150757 in webkit

Timestamp:

May 27, 2013, 8:37:16 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Remove encoding parameter from FrameLoaderClientBlackBerry::receivedData()
​https://bugs.webkit.org/show_bug.cgi?id=116598

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2013-05-27
Reviewed by Rob Buis.

It's no longer needed since the encoder now checks the override encoding.

• WebCoreSupport/FrameLoaderClientBlackBerry.cpp:

(WebCore::FrameLoaderClientBlackBerry::committedLoad): Call
receivedData() passing the DocumentLoader instead of the text
encoding.
(WebCore::FrameLoaderClientBlackBerry::receivedData): Call
DocumentLoader::commitData() directly.

• WebCoreSupport/FrameLoaderClientBlackBerry.h:

(FrameLoaderClientBlackBerry):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/FrameLoaderClientBlackBerry.cpp (modified) (3 diffs)
• WebCoreSupport/FrameLoaderClientBlackBerry.h (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-27  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [BlackBerry] Remove encoding parameter from FrameLoaderClientBlackBerry::receivedData()
+        https://bugs.webkit.org/show_bug.cgi?id=116598
+
+        Reviewed by Rob Buis.
+
+        It's no longer needed since the encoder now checks the override encoding.
+
+        * WebCoreSupport/FrameLoaderClientBlackBerry.cpp:
+        (WebCore::FrameLoaderClientBlackBerry::committedLoad): Call
+        receivedData() passing the DocumentLoader instead of the text
+        encoding.
+        (WebCore::FrameLoaderClientBlackBerry::receivedData): Call
+        DocumentLoader::commitData() directly.
+        * WebCoreSupport/FrameLoaderClientBlackBerry.h:
+        (FrameLoaderClientBlackBerry):
+
 2013-05-27  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp

@@ -290 +290 @@
     // to receivedData.
 
-    if (!m_pluginView) {
-        const String& textEncoding = loader->response().textEncodingName();
-        receivedData(data, length, textEncoding);
-    }
+    if (!m_pluginView)
+        receivedData(loader, data, length);
 
     if (m_pluginView) {
@@ -348 +346 @@
 }
 
-void FrameLoaderClientBlackBerry::receivedData(const char* data, int length, const String& textEncoding)
+void FrameLoaderClientBlackBerry::receivedData(DocumentLoader* loader, const char* data, int length)
 {
     if (!m_frame)
@@ -360 +358 @@
     }
 
-    // Set the encoding. This only needs to be done once, but it's harmless to do it again later.
-    String encoding = m_frame->loader()->documentLoader()->overrideEncoding();
-    bool userChosen = !encoding.isNull();
-    if (encoding.isNull())
-        encoding = textEncoding;
-    m_frame->loader()->documentLoader()->writer()->setEncoding(encoding, userChosen);
-    m_frame->loader()->documentLoader()->writer()->addData(data, length);
+    // The encoder now checks the override encoding and sets everything on our behalf.
+    loader->commitData(data, length);
 }
 

trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h

@@ -182 +182 @@
 
 private:
-    void receivedData(const char*, int, const String&);
+    void receivedData(DocumentLoader*, const char*, int, const String&);
     void didFinishOrFailLoading(const ResourceError&);
     bool isMainFrame() const;