<!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>[149823] trunk/Source/WebCore</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/149823">149823</a></dd>
<dt>Author</dt> <dd>mifenton@rim.com</dd>
<dt>Date</dt> <dd>2013-05-09 11:02:34 -0700 (Thu, 09 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[BlackBerry] Style updates required based on new check-webkit-style
https://bugs.webkit.org/show_bug.cgi?id=115857

Reviewed by Rob Buis.

Update WebCore/platform/network/blackberry
to match check-webkit-style updates.

* platform/network/blackberry/NetworkJob.cpp:
(WebCore::NetworkJob::initialize):
(WebCore::NetworkJob::handleSetCookieHeader):
(WebCore::NetworkJob::sendResponseIfNeeded):
(WebCore::NetworkJob::shouldSendClientData):
* platform/network/blackberry/NetworkJob.h:
(NetworkJob):
* platform/network/blackberry/NetworkManager.cpp:
(WebCore::NetworkManager::startJob):
* platform/network/blackberry/rss/RSSFilterStream.cpp:
(WebCore::isRSSContent):
(WebCore::transcode):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkblackberryNetworkJobcpp">trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkblackberryNetworkJobh">trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkblackberryNetworkManagercpp">trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkblackberryrssRSSFilterStreamcpp">trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (149822 => 149823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/ChangeLog        2013-05-09 18:02:34 UTC (rev 149823)
</span><span class="lines">@@ -5,6 +5,29 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Rob Buis.
</span><span class="cx"> 
</span><ins>+        Update WebCore/platform/network/blackberry
+        to match check-webkit-style updates.
+
+        * platform/network/blackberry/NetworkJob.cpp:
+        (WebCore::NetworkJob::initialize):
+        (WebCore::NetworkJob::handleSetCookieHeader):
+        (WebCore::NetworkJob::sendResponseIfNeeded):
+        (WebCore::NetworkJob::shouldSendClientData):
+        * platform/network/blackberry/NetworkJob.h:
+        (NetworkJob):
+        * platform/network/blackberry/NetworkManager.cpp:
+        (WebCore::NetworkManager::startJob):
+        * platform/network/blackberry/rss/RSSFilterStream.cpp:
+        (WebCore::isRSSContent):
+        (WebCore::transcode):
+
+2013-05-09  Mike Fenton  &lt;mifenton@rim.com&gt;
+
+        [BlackBerry] Style updates required based on new check-webkit-style
+        https://bugs.webkit.org/show_bug.cgi?id=115857
+
+        Reviewed by Rob Buis.
+
</ins><span class="cx">         Update WebCore/platform/blackberry to match check-webkit-style updates.
</span><span class="cx"> 
</span><span class="cx">         No functional changes.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkblackberryNetworkJobcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp (149822 => 149823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp        2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.cpp        2013-05-09 18:02:34 UTC (rev 149823)
</span><span class="lines">@@ -116,14 +116,14 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool NetworkJob::initialize(int playerId,
</span><del>-                            const String&amp; pageGroupName,
-                            const KURL&amp; url,
-                            const BlackBerry::Platform::NetworkRequest&amp; request,
-                            PassRefPtr&lt;ResourceHandle&gt; handle,
-                            BlackBerry::Platform::NetworkStreamFactory* streamFactory,
-                            Frame* frame,
-                            int deferLoadingCount,
-                            int redirectCount)
</del><ins>+    const String&amp; pageGroupName,
+    const KURL&amp; url,
+    const BlackBerry::Platform::NetworkRequest&amp; request,
+    PassRefPtr&lt;ResourceHandle&gt; handle,
+    BlackBerry::Platform::NetworkStreamFactory* streamFactory,
+    Frame* frame,
+    int deferLoadingCount,
+    int redirectCount)
</ins><span class="cx"> {
</span><span class="cx">     BLACKBERRY_ASSERT(handle);
</span><span class="cx">     BLACKBERRY_ASSERT(frame);
</span><span class="lines">@@ -169,8 +169,8 @@
</span><span class="cx"> 
</span><span class="cx">     BlackBerry::Platform::NetworkRequest::TargetType targetType = request.getTargetType();
</span><span class="cx">     if ((targetType == BlackBerry::Platform::NetworkRequest::TargetIsMainFrame
</span><del>-         || targetType == BlackBerry::Platform::NetworkRequest::TargetIsSubframe)
-            &amp;&amp; !m_isOverrideContentType) {
</del><ins>+        || targetType == BlackBerry::Platform::NetworkRequest::TargetIsSubframe)
+        &amp;&amp; !m_isOverrideContentType) {
</ins><span class="cx">         RSSFilterStream* filter = new RSSFilterStream();
</span><span class="cx">         filter-&gt;setWrappedStream(wrappedStream);
</span><span class="cx">         wrappedStream = filter;
</span><span class="lines">@@ -456,8 +456,8 @@
</span><span class="cx">     KURL url = m_response.url();
</span><span class="cx">     CookieManager&amp; manager = cookieManager();
</span><span class="cx">     if ((manager.cookiePolicy() == CookieStorageAcceptPolicyOnlyFromMainDocumentDomain)
</span><del>-      &amp;&amp; (m_handle-&gt;firstRequest().firstPartyForCookies() != url)
-      &amp;&amp; manager.getCookie(url, WithHttpOnlyCookies).isEmpty())
</del><ins>+        &amp;&amp; (m_handle-&gt;firstRequest().firstPartyForCookies() != url)
+        &amp;&amp; manager.getCookie(url, WithHttpOnlyCookies).isEmpty())
</ins><span class="cx">         return;
</span><span class="cx">     manager.setCookies(url, value);
</span><span class="cx"> }
</span><span class="lines">@@ -749,9 +749,9 @@
</span><span class="cx">                 suggestedFilename = String(BlackBerry::Platform::LocalizeResource::getString(BlackBerry::Platform::FILENAME_UNTITLED)) + &quot;.&quot; + mimeExtension;
</span><span class="cx">         } else {
</span><span class="cx">             if (urlFilename.reverseFind('.') == notFound &amp;&amp; !mimeExtension.isEmpty())
</span><del>-               suggestedFilename = urlFilename + '.' + mimeExtension;
</del><ins>+                suggestedFilename = urlFilename + '.' + mimeExtension;
</ins><span class="cx">             else
</span><del>-               suggestedFilename = urlFilename;
</del><ins>+                suggestedFilename = urlFilename;
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     m_response.setSuggestedFilename(suggestedFilename);
</span><span class="lines">@@ -1004,7 +1004,7 @@
</span><span class="cx"> bool NetworkJob::shouldSendClientData() const
</span><span class="cx"> {
</span><span class="cx">     return (!isRedirect(m_extendedStatusCode) || !m_response.httpHeaderFields().contains(&quot;Location&quot;))
</span><del>-           &amp;&amp; !m_needsRetryAsFTPDirectory;
</del><ins>+        &amp;&amp; !m_needsRetryAsFTPDirectory;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void NetworkJob::fireDeleteJobTimer(Timer&lt;NetworkJob&gt;*)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkblackberryNetworkJobh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h (149822 => 149823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h        2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkJob.h        2013-05-09 18:02:34 UTC (rev 149823)
</span><span class="lines">@@ -53,14 +53,14 @@
</span><span class="cx">     ~NetworkJob();
</span><span class="cx"> 
</span><span class="cx">     bool initialize(int playerId,
</span><del>-                    const String&amp; pageGroupName,
-                    const KURL&amp;,
-                    const BlackBerry::Platform::NetworkRequest&amp;,
-                    PassRefPtr&lt;ResourceHandle&gt;,
-                    BlackBerry::Platform::NetworkStreamFactory*,
-                    Frame*,
-                    int deferLoadingCount,
-                    int redirectCount);
</del><ins>+        const String&amp; pageGroupName,
+        const KURL&amp;,
+        const BlackBerry::Platform::NetworkRequest&amp;,
+        PassRefPtr&lt;ResourceHandle&gt;,
+        BlackBerry::Platform::NetworkStreamFactory*,
+        Frame*,
+        int deferLoadingCount,
+        int redirectCount);
</ins><span class="cx">     PassRefPtr&lt;ResourceHandle&gt; handle() const { return m_handle; }
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     bool isRunning() const { return m_isRunning; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkblackberryNetworkManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp (149822 => 149823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp        2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/platform/network/blackberry/NetworkManager.cpp        2013-05-09 18:02:34 UTC (rev 149823)
</span><span class="lines">@@ -158,9 +158,8 @@
</span><span class="cx">     request.initializePlatformRequest(platformRequest, frame-&gt;loader() &amp;&amp; frame-&gt;loader()-&gt;client() &amp;&amp; static_cast&lt;FrameLoaderClientBlackBerry*&gt;(frame-&gt;loader()-&gt;client())-&gt;cookiesEnabled(), isInitial, rereadCookies);
</span><span class="cx"> 
</span><span class="cx">     const String&amp; documentUrl = frame-&gt;document()-&gt;url().string();
</span><del>-    if (!documentUrl.isEmpty()) {
</del><ins>+    if (!documentUrl.isEmpty())
</ins><span class="cx">         platformRequest.setReferrer(documentUrl);
</span><del>-    }
</del><span class="cx"> 
</span><span class="cx">     platformRequest.setSecurityOrigin(frame-&gt;document()-&gt;securityOrigin()-&gt;toRawString());
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkblackberryrssRSSFilterStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp (149822 => 149823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp        2013-05-09 17:59:20 UTC (rev 149822)
+++ trunk/Source/WebCore/platform/network/blackberry/rss/RSSFilterStream.cpp        2013-05-09 18:02:34 UTC (rev 149823)
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx"> static inline bool isRSSContent(RSSFilterStream::ResourceType type)
</span><span class="cx"> {
</span><span class="cx">     return type == RSSFilterStream::TypeRSS10
</span><del>-            || type == RSSFilterStream::TypeRSS20
-            || type == RSSFilterStream::TypeRSSAtom;
</del><ins>+        || type == RSSFilterStream::TypeRSS20
+        || type == RSSFilterStream::TypeRSSAtom;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static RSSFilterStream::ResourceType RSSTypeFromContentType(const std::string&amp; contentType)
</span><span class="lines">@@ -335,11 +335,11 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> static TranscodeResult transcode(const char* sourceEncoding,
</span><del>-                                 const char* targetEncoding,
-                                 const char*&amp; sourceStart,
-                                 int sourceLength,
-                                 char*&amp; targetStart,
-                                 unsigned int targetLength)
</del><ins>+    const char* targetEncoding,
+    const char*&amp; sourceStart,
+    int sourceLength,
+    char*&amp; targetStart,
+    unsigned targetLength)
</ins><span class="cx"> {
</span><span class="cx">     TextEncoding textEncodingSource(sourceEncoding);
</span><span class="cx">     if (!textEncodingSource.isValid())
</span></span></pre>
</div>
</div>

</body>
</html>