<!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>[47746] trunk/WebKit/qt</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/47746">47746</a></dd>
<dt>Author</dt> <dd>kenneth@webkit.org</dd>
<dt>Date</dt> <dd>2009-08-25 06:12:07 -0700 (Tue, 25 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-08-25  Antonio Gomes   &lt;antonio.gomes@openbossa.org&gt;

        Reviewed by Ariya Hidayat.

        Bug 28708 - Make possible to better use ResourceError in FrameLoaderClientQt class.

        * Api/qwebframe.cpp:
        (QWebFrame::requestedUrl):
        * WebCoreSupport/FrameLoaderClientQt.cpp:
        (WebCore::FrameLoaderClientQt::FrameLoaderClientQt):
        (WebCore::FrameLoaderClientQt::dispatchDidFinishLoad):
        (WebCore::FrameLoaderClientQt::postProgressFinishedNotification):
        (WebCore::FrameLoaderClientQt::dispatchDidFailProvisionalLoad):
        (WebCore::FrameLoaderClientQt::dispatchDidFailLoad):
        * WebCoreSupport/FrameLoaderClientQt.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitqtApiqwebframecpp">trunk/WebKit/qt/Api/qwebframe.cpp</a></li>
<li><a href="#trunkWebKitqtChangeLog">trunk/WebKit/qt/ChangeLog</a></li>
<li><a href="#trunkWebKitqtWebCoreSupportFrameLoaderClientQtcpp">trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp</a></li>
<li><a href="#trunkWebKitqtWebCoreSupportFrameLoaderClientQth">trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitqtApiqwebframecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/qt/Api/qwebframe.cpp (47745 => 47746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/Api/qwebframe.cpp        2009-08-25 13:08:29 UTC (rev 47745)
+++ trunk/WebKit/qt/Api/qwebframe.cpp        2009-08-25 13:12:07 UTC (rev 47746)
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx">     // loader does not get commited by the frame loader) it is
</span><span class="cx">     // safer to rely on outgoingReferrer than originalRequest.
</span><span class="cx">     if (!d-&gt;frame-&gt;loader()-&gt;activeDocumentLoader()
</span><del>-        || (!d-&gt;frameLoaderClient-&gt;m_loadSucceeded
</del><ins>+        || (!d-&gt;frameLoaderClient-&gt;m_loadError.isNull()
</ins><span class="cx">         &amp;&amp;  !d-&gt;frame-&gt;loader()-&gt;outgoingReferrer().isEmpty()))
</span><span class="cx">         return QUrl(d-&gt;frame-&gt;loader()-&gt;outgoingReferrer());
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitqtChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/qt/ChangeLog (47745 => 47746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/ChangeLog        2009-08-25 13:08:29 UTC (rev 47745)
+++ trunk/WebKit/qt/ChangeLog        2009-08-25 13:12:07 UTC (rev 47746)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2009-08-25  Antonio Gomes   &lt;antonio.gomes@openbossa.org&gt;
+
+        Reviewed by Ariya Hidayat.
+
+        Bug 28708 - Make possible to better use ResourceError in FrameLoaderClientQt class.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::requestedUrl):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::FrameLoaderClientQt):
+        (WebCore::FrameLoaderClientQt::dispatchDidFinishLoad):
+        (WebCore::FrameLoaderClientQt::postProgressFinishedNotification):
+        (WebCore::FrameLoaderClientQt::dispatchDidFailProvisionalLoad):
+        (WebCore::FrameLoaderClientQt::dispatchDidFailLoad):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+
</ins><span class="cx"> 2009-08-22  Adam Barth  &lt;abarth@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Revert 47684.  We're going to do this later once clients have had a
</span></span></pre></div>
<a id="trunkWebKitqtWebCoreSupportFrameLoaderClientQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (47745 => 47746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp        2009-08-25 13:08:29 UTC (rev 47745)
+++ trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp        2009-08-25 13:12:07 UTC (rev 47746)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">     , m_pluginView(0)
</span><span class="cx">     , m_hasSentResponseToPlugin(false)
</span><span class="cx">     , m_firstData(false)
</span><del>-    , m_loadSucceeded(false)
</del><ins>+    , m_loadError (ResourceError())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx">     if (dumpFrameLoaderCallbacks)
</span><span class="cx">         printf(&quot;%s - didFinishLoadForFrame\n&quot;, qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
</span><span class="cx"> 
</span><del>-    m_loadSucceeded = true;
</del><ins>+    m_loadError = ResourceError(); // clears the previous error
</ins><span class="cx"> 
</span><span class="cx">     if (!m_webFrame)
</span><span class="cx">         return;
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (m_webFrame &amp;&amp; m_frame-&gt;page())
</span><del>-        emit loadFinished(m_loadSucceeded);
</del><ins>+        emit loadFinished(m_loadError.isNull());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameLoaderClientQt::setMainFrameDocumentReady(bool b)
</span><span class="lines">@@ -850,20 +850,20 @@
</span><span class="cx">     notImplemented();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameLoaderClientQt::dispatchDidFailProvisionalLoad(const WebCore::ResourceError&amp;)
</del><ins>+void FrameLoaderClientQt::dispatchDidFailProvisionalLoad(const WebCore::ResourceError&amp; error)
</ins><span class="cx"> {
</span><span class="cx">     if (dumpFrameLoaderCallbacks)
</span><span class="cx">         printf(&quot;%s - didFailProvisionalLoadWithError\n&quot;, qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
</span><span class="cx"> 
</span><del>-    m_loadSucceeded = false;
</del><ins>+    m_loadError = error;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void FrameLoaderClientQt::dispatchDidFailLoad(const WebCore::ResourceError&amp;)
</del><ins>+void FrameLoaderClientQt::dispatchDidFailLoad(const WebCore::ResourceError&amp; error)
</ins><span class="cx"> {
</span><span class="cx">     if (dumpFrameLoaderCallbacks)
</span><span class="cx">         printf(&quot;%s - didFailLoadWithError\n&quot;, qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
</span><span class="cx"> 
</span><del>-    m_loadSucceeded = false;
</del><ins>+    m_loadError = error;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebCore::Frame* FrameLoaderClientQt::dispatchCreatePage()
</span></span></pre></div>
<a id="trunkWebKitqtWebCoreSupportFrameLoaderClientQth"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h (47745 => 47746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h        2009-08-25 13:08:29 UTC (rev 47745)
+++ trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h        2009-08-25 13:12:07 UTC (rev 47746)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx">         WebCore::PluginView* m_pluginView;
</span><span class="cx">         bool m_hasSentResponseToPlugin;
</span><span class="cx"> 
</span><del>-        bool m_loadSucceeded;
</del><ins>+        ResourceError m_loadError;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>