<!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>[150757] trunk/Source/WebKit/blackberry</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/150757">150757</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-27 08:37:16 -0700 (Mon, 27 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[BlackBerry] Remove encoding parameter from FrameLoaderClientBlackBerry::receivedData()
https://bugs.webkit.org/show_bug.cgi?id=116598

Patch by Carlos Garcia Campos &lt;cgarcia@igalia.com&gt; 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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitblackberryChangeLog">trunk/Source/WebKit/blackberry/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitblackberryWebCoreSupportFrameLoaderClientBlackBerrycpp">trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebKitblackberryWebCoreSupportFrameLoaderClientBlackBerryh">trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitblackberryChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/ChangeLog (150756 => 150757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/ChangeLog        2013-05-27 15:35:15 UTC (rev 150756)
+++ trunk/Source/WebKit/blackberry/ChangeLog        2013-05-27 15:37:16 UTC (rev 150757)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2013-05-27  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><ins>+        [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  &lt;cgarcia@igalia.com&gt;
+
</ins><span class="cx">         [BlackBerry] Move PagePopup implementation to WebKitSupport
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=116824
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryWebCoreSupportFrameLoaderClientBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp (150756 => 150757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp        2013-05-27 15:35:15 UTC (rev 150756)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.cpp        2013-05-27 15:37:16 UTC (rev 150757)
</span><span class="lines">@@ -289,10 +289,8 @@
</span><span class="cx">     // Thereafter, all data will be re-directed to the PluginView; i.e., no additional data will go
</span><span class="cx">     // to receivedData.
</span><span class="cx"> 
</span><del>-    if (!m_pluginView) {
-        const String&amp; textEncoding = loader-&gt;response().textEncodingName();
-        receivedData(data, length, textEncoding);
-    }
</del><ins>+    if (!m_pluginView)
+        receivedData(loader, data, length);
</ins><span class="cx"> 
</span><span class="cx">     if (m_pluginView) {
</span><span class="cx">         if (!m_hasSentResponseToPlugin) {
</span><span class="lines">@@ -347,7 +345,7 @@
</span><span class="cx">         m_hasSentResponseToPlugin = false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameLoaderClientBlackBerry::receivedData(const char* data, int length, const String&amp; textEncoding)
</del><ins>+void FrameLoaderClientBlackBerry::receivedData(DocumentLoader* loader, const char* data, int length)
</ins><span class="cx"> {
</span><span class="cx">     if (!m_frame)
</span><span class="cx">         return;
</span><span class="lines">@@ -359,13 +357,8 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // Set the encoding. This only needs to be done once, but it's harmless to do it again later.
-    String encoding = m_frame-&gt;loader()-&gt;documentLoader()-&gt;overrideEncoding();
-    bool userChosen = !encoding.isNull();
-    if (encoding.isNull())
-        encoding = textEncoding;
-    m_frame-&gt;loader()-&gt;documentLoader()-&gt;writer()-&gt;setEncoding(encoding, userChosen);
-    m_frame-&gt;loader()-&gt;documentLoader()-&gt;writer()-&gt;addData(data, length);
</del><ins>+    // The encoder now checks the override encoding and sets everything on our behalf.
+    loader-&gt;commitData(data, length);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClientBlackBerry::finishedLoading(DocumentLoader*)
</span></span></pre></div>
<a id="trunkSourceWebKitblackberryWebCoreSupportFrameLoaderClientBlackBerryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h (150756 => 150757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h        2013-05-27 15:35:15 UTC (rev 150756)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/FrameLoaderClientBlackBerry.h        2013-05-27 15:37:16 UTC (rev 150757)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">     void suppressChildFrameCreation() { m_childFrameCreationSuppressed = true; }
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    void receivedData(const char*, int, const String&amp;);
</del><ins>+    void receivedData(DocumentLoader*, const char*, int, const String&amp;);
</ins><span class="cx">     void didFinishOrFailLoading(const ResourceError&amp;);
</span><span class="cx">     bool isMainFrame() const;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>