<!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>[46535] trunk/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/46535">46535</a></dd>
<dt>Author</dt> <dd>hausmann@webkit.org</dd>
<dt>Date</dt> <dd>2009-07-29 03:33:20 -0700 (Wed, 29 Jul 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-07-29  Yongjun Zhang  &lt;yongjun.zhang@nokia.com&gt;

        Reviewed by Simon Hausmann.

        https://bugs.webkit.org/show_bug.cgi?id=26848
        [Qt] ResourceHandle::willLoadFromCache needs to be implemented QtWebKit.

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::loadItem):
        * platform/network/ResourceHandle.h:
        * platform/network/cf/ResourceHandleCFNet.cpp:
        (WebCore::ResourceHandle::willLoadFromCache):
        * platform/network/curl/ResourceHandleCurl.cpp:
        (WebCore::ResourceHandle::willLoadFromCache):
        * platform/network/mac/ResourceHandleMac.mm:
        (WebCore::ResourceHandle::willLoadFromCache):
        * platform/network/qt/ResourceHandleQt.cpp:
        (WebCore::ResourceHandle::willLoadFromCache):
        * platform/network/soup/ResourceHandleSoup.cpp:
        (WebCore::):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreloaderFrameLoadercpp">trunk/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkWebCoreplatformnetworkResourceHandleh">trunk/WebCore/platform/network/ResourceHandle.h</a></li>
<li><a href="#trunkWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkWebCoreplatformnetworkcurlResourceHandleCurlcpp">trunk/WebCore/platform/network/curl/ResourceHandleCurl.cpp</a></li>
<li><a href="#trunkWebCoreplatformnetworkmacResourceHandleMacmm">trunk/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
<li><a href="#trunkWebCoreplatformnetworkqtResourceHandleQtcpp">trunk/WebCore/platform/network/qt/ResourceHandleQt.cpp</a></li>
<li><a href="#trunkWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (46534 => 46535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-07-29 09:53:02 UTC (rev 46534)
+++ trunk/WebCore/ChangeLog        2009-07-29 10:33:20 UTC (rev 46535)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2009-07-29  Yongjun Zhang  &lt;yongjun.zhang@nokia.com&gt;
+
+        Reviewed by Simon Hausmann.
+
+        https://bugs.webkit.org/show_bug.cgi?id=26848
+        [Qt] ResourceHandle::willLoadFromCache needs to be implemented QtWebKit.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadItem):
+        * platform/network/ResourceHandle.h:
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::ResourceHandle::willLoadFromCache):
+        * platform/network/curl/ResourceHandleCurl.cpp:
+        (WebCore::ResourceHandle::willLoadFromCache):
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::willLoadFromCache):
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::ResourceHandle::willLoadFromCache):
+        * platform/network/soup/ResourceHandleSoup.cpp:
+        (WebCore::):
+
</ins><span class="cx"> 2009-07-29  Alpha Lam  &lt;hclam@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by David Levin.
</span></span></pre></div>
<a id="trunkWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/loader/FrameLoader.cpp (46534 => 46535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/loader/FrameLoader.cpp        2009-07-29 09:53:02 UTC (rev 46534)
+++ trunk/WebCore/loader/FrameLoader.cpp        2009-07-29 10:33:20 UTC (rev 46535)
</span><span class="lines">@@ -4520,7 +4520,7 @@
</span><span class="cx">                 // have the item vanish when we try to use it in the ensuing nav.  This should be
</span><span class="cx">                 // extremely rare, but in that case the user will get an error on the navigation.
</span><span class="cx">                 
</span><del>-                if (ResourceHandle::willLoadFromCache(request))
</del><ins>+                if (ResourceHandle::willLoadFromCache(request, m_frame))
</ins><span class="cx">                     action = NavigationAction(itemURL, loadType, false);
</span><span class="cx">                 else {
</span><span class="cx">                     request.setCachePolicy(ReloadIgnoringCacheData);
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkResourceHandleh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/ResourceHandle.h (46534 => 46535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/ResourceHandle.h        2009-07-29 09:53:02 UTC (rev 46534)
+++ trunk/WebCore/platform/network/ResourceHandle.h        2009-07-29 10:33:20 UTC (rev 46535)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">     static PassRefPtr&lt;ResourceHandle&gt; create(const ResourceRequest&amp;, ResourceHandleClient*, Frame*, bool defersLoading, bool shouldContentSniff, bool mightDownloadFromHandle = false);
</span><span class="cx"> 
</span><span class="cx">     static void loadResourceSynchronously(const ResourceRequest&amp;, StoredCredentials, ResourceError&amp;, ResourceResponse&amp;, Vector&lt;char&gt;&amp; data, Frame* frame);
</span><del>-    static bool willLoadFromCache(ResourceRequest&amp;);
</del><ins>+    static bool willLoadFromCache(ResourceRequest&amp;, Frame*);
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">     static bool didSendBodyDataDelegateExists();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (46534 => 46535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp        2009-07-29 09:53:02 UTC (rev 46534)
+++ trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp        2009-07-29 10:33:20 UTC (rev 46535)
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ResourceHandle::willLoadFromCache(ResourceRequest&amp; request)
</del><ins>+bool ResourceHandle::willLoadFromCache(ResourceRequest&amp; request, Frame* frame)
</ins><span class="cx"> {
</span><span class="cx">     request.setCachePolicy(ReturnCacheDataDontLoad);
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkcurlResourceHandleCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/curl/ResourceHandleCurl.cpp (46534 => 46535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/curl/ResourceHandleCurl.cpp        2009-07-29 09:53:02 UTC (rev 46534)
+++ trunk/WebCore/platform/network/curl/ResourceHandleCurl.cpp        2009-07-29 10:33:20 UTC (rev 46535)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ResourceHandle::willLoadFromCache(ResourceRequest&amp;)
</del><ins>+bool ResourceHandle::willLoadFromCache(ResourceRequest&amp;, Frame*)
</ins><span class="cx"> {
</span><span class="cx">     notImplemented();
</span><span class="cx">     return false;
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/mac/ResourceHandleMac.mm (46534 => 46535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/mac/ResourceHandleMac.mm        2009-07-29 09:53:02 UTC (rev 46534)
+++ trunk/WebCore/platform/network/mac/ResourceHandleMac.mm        2009-07-29 10:33:20 UTC (rev 46535)
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ResourceHandle::willLoadFromCache(ResourceRequest&amp; request)
</del><ins>+bool ResourceHandle::willLoadFromCache(ResourceRequest&amp; request, Frame*)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef BUILDING_ON_TIGER
</span><span class="cx">     request.setCachePolicy(ReturnCacheDataDontLoad);
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkqtResourceHandleQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/qt/ResourceHandleQt.cpp (46534 => 46535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/qt/ResourceHandleQt.cpp        2009-07-29 09:53:02 UTC (rev 46534)
+++ trunk/WebCore/platform/network/qt/ResourceHandleQt.cpp        2009-07-29 10:33:20 UTC (rev 46535)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include &quot;ResourceHandleClient.h&quot;
</span><span class="cx"> #include &quot;ResourceHandleInternal.h&quot;
</span><span class="cx"> #include &quot;qwebpage_p.h&quot;
</span><ins>+#include &quot;qwebframe_p.h&quot;
</ins><span class="cx"> #include &quot;ChromeClientQt.h&quot;
</span><span class="cx"> #include &quot;FrameLoaderClientQt.h&quot;
</span><span class="cx"> #include &quot;Page.h&quot;
</span><span class="lines">@@ -48,6 +49,7 @@
</span><span class="cx"> #include &lt;QNetworkAccessManager&gt;
</span><span class="cx"> #include &lt;QNetworkRequest&gt;
</span><span class="cx"> #include &lt;QNetworkReply&gt;
</span><ins>+#include &lt;QAbstractNetworkCache&gt;
</ins><span class="cx"> #else
</span><span class="cx"> #include &quot;qwebnetworkinterface_p.h&quot;
</span><span class="cx"> #endif
</span><span class="lines">@@ -154,10 +156,28 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ResourceHandle::willLoadFromCache(ResourceRequest&amp; request)
</del><ins>+bool ResourceHandle::willLoadFromCache(ResourceRequest&amp; request, Frame* frame)
</ins><span class="cx"> {
</span><del>-    notImplemented();
</del><ins>+    if (!frame)
+        return false;
+
+#if QT_VERSION &gt;= 0x040500
+    QNetworkAccessManager* manager = QWebFramePrivate::kit(frame)-&gt;page()-&gt;networkAccessManager();
+    QAbstractNetworkCache* cache = manager-&gt;cache();
+
+    if (!cache)
+        return false;
+
+    QNetworkCacheMetaData data = cache-&gt;metaData(request.url());
+    if (data.isValid()) {
+        request.setCachePolicy(ReturnCacheDataDontLoad);
+        return true;
+    }
+
</ins><span class="cx">     return false;
</span><ins>+#else
+    return false;
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool ResourceHandle::supportsBufferedData()
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp (46534 => 46535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2009-07-29 09:53:02 UTC (rev 46534)
+++ trunk/WebCore/platform/network/soup/ResourceHandleSoup.cpp        2009-07-29 10:33:20 UTC (rev 46535)
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool ResourceHandle::willLoadFromCache(ResourceRequest&amp;)
</del><ins>+bool ResourceHandle::willLoadFromCache(ResourceRequest&amp;, Frame*)
</ins><span class="cx"> {
</span><span class="cx">     // Not having this function means that we'll ask the user about re-posting a form
</span><span class="cx">     // even when we go back to a page that's still in the cache.
</span></span></pre>
</div>
</div>

</body>
</html>