<!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>[161751] trunk/Source</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/161751">161751</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 23:33:48 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweak ProgressTrackerClient functions
https://bugs.webkit.org/show_bug.cgi?id=126808
Reviewed by Sam Weinig.
Source/WebCore:
Rename the three progress state related member functions since it's up to the various
WebKit implementations to decide what to do - not everyone wants to post a notification.
Also add an originating progress frame parameter since WebKit2 doesn't report progress for
subframe navigation and we need to be able to keep track of that.
Finally, tweak ProgressTracker::completeProgress to get rid of an unnecessary hash lookup.
* loader/EmptyClients.h:
* loader/ProgressTracker.cpp:
(WebCore::ProgressItem::ProgressItem):
(WebCore::ProgressTracker::progressStarted):
(WebCore::ProgressTracker::finalProgressComplete):
(WebCore::ProgressTracker::incrementProgress):
(WebCore::ProgressTracker::completeProgress):
* loader/ProgressTrackerClient.h:
Source/WebKit/efl:
* WebCoreSupport/FrameLoaderClientEfl.cpp:
(WebCore::FrameLoaderClientEfl::progressStarted):
(WebCore::FrameLoaderClientEfl::progressEstimateChanged):
(WebCore::FrameLoaderClientEfl::progressFinished):
* WebCoreSupport/FrameLoaderClientEfl.h:
Source/WebKit/gtk:
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::progressStarted):
(WebKit::FrameLoaderClient::progressEstimateChanged):
(WebKit::FrameLoaderClient::progressFinished):
* WebCoreSupport/FrameLoaderClientGtk.h:
Source/WebKit/mac:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::progressStarted):
(WebFrameLoaderClient::progressEstimateChanged):
(WebFrameLoaderClient::progressFinished):
Source/WebKit/win:
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::progressStarted):
(WebFrameLoaderClient::progressEstimateChanged):
(WebFrameLoaderClient::progressFinished):
* WebCoreSupport/WebFrameLoaderClient.h:
Source/WebKit2:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::progressStarted):
(WebKit::WebFrameLoaderClient::progressEstimateChanged):
(WebKit::WebFrameLoaderClient::progressFinished):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackercpp">trunk/Source/WebCore/loader/ProgressTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackerClienth">trunk/Source/WebCore/loader/ProgressTrackerClient.h</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportFrameLoaderClientEflcpp">trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportFrameLoaderClientEflh">trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkh">trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Tweak ProgressTrackerClient functions
+ https://bugs.webkit.org/show_bug.cgi?id=126808
+
+ Reviewed by Sam Weinig.
+
+ Rename the three progress state related member functions since it's up to the various
+ WebKit implementations to decide what to do - not everyone wants to post a notification.
+ Also add an originating progress frame parameter since WebKit2 doesn't report progress for
+ subframe navigation and we need to be able to keep track of that.
+
+ Finally, tweak ProgressTracker::completeProgress to get rid of an unnecessary hash lookup.
+
+ * loader/EmptyClients.h:
+ * loader/ProgressTracker.cpp:
+ (WebCore::ProgressItem::ProgressItem):
+ (WebCore::ProgressTracker::progressStarted):
+ (WebCore::ProgressTracker::finalProgressComplete):
+ (WebCore::ProgressTracker::incrementProgress):
+ (WebCore::ProgressTracker::completeProgress):
+ * loader/ProgressTrackerClient.h:
+
</ins><span class="cx"> 2014-01-10 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix COMPILE_ASSERT by updating struct SameSizeAsStyleRareInheritedData
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -636,9 +636,10 @@
</span><span class="cx"> class EmptyProgressTrackerClient : public ProgressTrackerClient {
</span><span class="cx"> virtual void willChangeEstimatedProgress() OVERRIDE { }
</span><span class="cx"> virtual void didChangeEstimatedProgress() OVERRIDE { }
</span><del>- virtual void postProgressStartedNotification() OVERRIDE { }
- virtual void postProgressEstimateChangedNotification() OVERRIDE { }
- virtual void postProgressFinishedNotification() OVERRIDE { }
</del><ins>+
+ virtual void progressStarted(Frame&) OVERRIDE { }
+ virtual void progressEstimateChanged(Frame&) OVERRIDE { }
+ virtual void progressFinished(Frame&) OVERRIDE { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void fillWithEmptyClients(Page::PageClients&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.cpp (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -52,8 +52,10 @@
</span><span class="cx">
</span><span class="cx"> // Check if the load is progressing this often.
</span><span class="cx"> static const double progressHeartbeatInterval = 0.1;
</span><ins>+
</ins><span class="cx"> // How many heartbeats must pass without progress before deciding the load is currently stalled.
</span><span class="cx"> static const unsigned loadStalledHeartbeatCount = 4;
</span><ins>+
</ins><span class="cx"> // How many bytes are required between heartbeats to consider it progress.
</span><span class="cx"> static const unsigned minumumBytesPerHeartbeatForProgress = 1024;
</span><span class="cx">
</span><span class="lines">@@ -62,7 +64,9 @@
</span><span class="cx"> public:
</span><span class="cx"> ProgressItem(long long length)
</span><span class="cx"> : bytesReceived(0)
</span><del>- , estimatedLength(length) { }
</del><ins>+ , estimatedLength(length)
+ {
+ }
</ins><span class="cx">
</span><span class="cx"> long long bytesReceived;
</span><span class="cx"> long long estimatedLength;
</span><span class="lines">@@ -129,7 +133,7 @@
</span><span class="cx"> m_progressHeartbeatTimer.startRepeating(progressHeartbeatInterval);
</span><span class="cx"> m_originatingProgressFrame->loader().loadProgressingStatusChanged();
</span><span class="cx">
</span><del>- m_client.postProgressStartedNotification();
</del><ins>+ m_client.progressStarted(*m_originatingProgressFrame);
</ins><span class="cx"> }
</span><span class="cx"> m_numProgressTrackedFrames++;
</span><span class="cx">
</span><span class="lines">@@ -163,13 +167,13 @@
</span><span class="cx"> // with final progress value.
</span><span class="cx"> if (!m_finalProgressChangedSent) {
</span><span class="cx"> m_progressValue = 1;
</span><del>- m_client.postProgressEstimateChangedNotification();
</del><ins>+ m_client.progressEstimateChanged(*frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> reset();
</span><span class="cx">
</span><span class="cx"> frame->loader().client().setMainFrameDocumentReady(true);
</span><del>- m_client.postProgressFinishedNotification();
</del><ins>+ m_client.progressFinished(*frame);
</ins><span class="cx"> frame->loader().loadProgressingStatusChanged();
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::frameStoppedLoading(*frame);
</span><span class="lines">@@ -251,7 +255,7 @@
</span><span class="cx"> if (m_progressValue == 1)
</span><span class="cx"> m_finalProgressChangedSent = true;
</span><span class="cx">
</span><del>- m_client.postProgressEstimateChangedNotification();
</del><ins>+ m_client.progressEstimateChanged(*frame);
</ins><span class="cx">
</span><span class="cx"> m_lastNotifiedProgressValue = m_progressValue;
</span><span class="cx"> m_lastNotifiedProgressTime = now;
</span><span class="lines">@@ -263,17 +267,19 @@
</span><span class="cx">
</span><span class="cx"> void ProgressTracker::completeProgress(unsigned long identifier)
</span><span class="cx"> {
</span><del>- ProgressItem* item = m_progressItems.get(identifier);
-
</del><ins>+ auto it = m_progressItems.find(identifier);
+
</ins><span class="cx"> // This can happen if a load fails without receiving any response data.
</span><del>- if (!item)
</del><ins>+ if (it == m_progressItems.end())
</ins><span class="cx"> return;
</span><ins>+
+ ProgressItem& item = *it->value;
</ins><span class="cx">
</span><span class="cx"> // Adjust the total expected bytes to account for any overage/underage.
</span><del>- long long delta = item->bytesReceived - item->estimatedLength;
</del><ins>+ long long delta = item.bytesReceived - item.estimatedLength;
</ins><span class="cx"> m_totalPageAndResourceBytesToLoad += delta;
</span><span class="cx">
</span><del>- m_progressItems.remove(identifier);
</del><ins>+ m_progressItems.remove(it);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long ProgressTracker::createUniqueIdentifier()
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackerClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTrackerClient.h (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTrackerClient.h 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebCore/loader/ProgressTrackerClient.h 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -37,9 +37,10 @@
</span><span class="cx">
</span><span class="cx"> virtual void willChangeEstimatedProgress() { }
</span><span class="cx"> virtual void didChangeEstimatedProgress() { }
</span><del>- virtual void postProgressStartedNotification() = 0;
- virtual void postProgressEstimateChangedNotification() = 0;
- virtual void postProgressFinishedNotification() = 0;
</del><ins>+
+ virtual void progressStarted(Frame& originatingProgressFrame) = 0;
+ virtual void progressEstimateChanged(Frame& originatingProgressFrame) = 0;
+ virtual void progressFinished(Frame& originatingProgressFrame) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-01-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Tweak ProgressTrackerClient functions
+ https://bugs.webkit.org/show_bug.cgi?id=126808
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/FrameLoaderClientEfl.cpp:
+ (WebCore::FrameLoaderClientEfl::progressStarted):
+ (WebCore::FrameLoaderClientEfl::progressEstimateChanged):
+ (WebCore::FrameLoaderClientEfl::progressFinished):
+ * WebCoreSupport/FrameLoaderClientEfl.h:
+
+2014-01-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126801
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportFrameLoaderClientEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -243,18 +243,18 @@
</span><span class="cx"> evas_object_smart_callback_call(m_view, "resource,request,new", &request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoaderClientEfl::postProgressStartedNotification()
</del><ins>+void FrameLoaderClientEfl::progressStarted(WebCore::Frame&)
</ins><span class="cx"> {
</span><span class="cx"> ewk_frame_load_started(m_frame);
</span><del>- postProgressEstimateChangedNotification();
</del><ins>+ progressEstimateChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoaderClientEfl::postProgressEstimateChangedNotification()
</del><ins>+void FrameLoaderClientEfl::progressEstimateChanged(Frame&)
</ins><span class="cx"> {
</span><span class="cx"> ewk_frame_load_progress_changed(m_frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoaderClientEfl::postProgressFinishedNotification()
</del><ins>+void FrameLoaderClientEfl::progressFinished(Frame&)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportFrameLoaderClientEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -125,9 +125,9 @@
</span><span class="cx"> virtual void revertToProvisionalState(DocumentLoader*) { }
</span><span class="cx"> virtual void setMainDocumentError(DocumentLoader*, const ResourceError&);
</span><span class="cx">
</span><del>- virtual void postProgressStartedNotification();
- virtual void postProgressEstimateChangedNotification();
- virtual void postProgressFinishedNotification();
</del><ins>+ virtual void progressStarted(Frame&);
+ virtual void progressEstimateChanged(Frame&);
+ virtual void progressFinished(Frame&);
</ins><span class="cx">
</span><span class="cx"> virtual PassRefPtr<Frame> createFrame(const URL&, const String& name, HTMLFrameOwnerElement*,
</span><span class="cx"> const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-01-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Tweak ProgressTrackerClient functions
+ https://bugs.webkit.org/show_bug.cgi?id=126808
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::progressStarted):
+ (WebKit::FrameLoaderClient::progressEstimateChanged):
+ (WebKit::FrameLoaderClient::progressFinished):
+ * WebCoreSupport/FrameLoaderClientGtk.h:
+
+2014-01-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126801
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> webkit_web_view_add_resource(getViewFromFrame(m_frame), identifierString.get(), webResource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoaderClient::postProgressStartedNotification()
</del><ins>+void FrameLoaderClient::progressStarted(WebCore::Frame&)
</ins><span class="cx"> {
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><span class="cx"> g_signal_emit_by_name(webView, "load-started", m_frame);
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> g_object_notify(G_OBJECT(webView), "progress");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoaderClient::postProgressEstimateChangedNotification()
</del><ins>+void FrameLoaderClient::progressEstimateChanged(WebCore::Frame&)
</ins><span class="cx"> {
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><span class="cx"> Page* corePage = core(webView);
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> g_object_notify(G_OBJECT(webView), "progress");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoaderClient::postProgressFinishedNotification()
</del><ins>+void FrameLoaderClient::progressFinished(WebCore::Frame&)
</ins><span class="cx"> {
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><span class="cx"> WebKitWebViewPrivate* privateData = webView->priv;
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -112,9 +112,9 @@
</span><span class="cx"> virtual void revertToProvisionalState(WebCore::DocumentLoader*) { }
</span><span class="cx"> virtual void setMainDocumentError(WebCore::DocumentLoader*, const WebCore::ResourceError&);
</span><span class="cx">
</span><del>- virtual void postProgressStartedNotification();
- virtual void postProgressEstimateChangedNotification();
- virtual void postProgressFinishedNotification();
</del><ins>+ virtual void progressStarted(WebCore::Frame&);
+ virtual void progressEstimateChanged(WebCore::Frame&);
+ virtual void progressFinished(WebCore::Frame&);
</ins><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::Frame> createFrame(const WebCore::URL& url, const WTF::String& name, WebCore::HTMLFrameOwnerElement* ownerElement,
</span><span class="cx"> const WTF::String& referrer, bool allowsScrolling, int marginWidth, int marginHeight);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-01-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Tweak ProgressTrackerClient functions
+ https://bugs.webkit.org/show_bug.cgi?id=126808
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::progressStarted):
+ (WebFrameLoaderClient::progressEstimateChanged):
+ (WebFrameLoaderClient::progressFinished):
+
+2014-01-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126801
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -139,13 +139,9 @@
</span><span class="cx"> virtual void willChangeEstimatedProgress() OVERRIDE;
</span><span class="cx"> virtual void didChangeEstimatedProgress() OVERRIDE;
</span><span class="cx"> #endif
</span><del>- virtual void postProgressStartedNotification() OVERRIDE;
- virtual void postProgressEstimateChangedNotification() OVERRIDE;
-#if !PLATFORM(IOS)
- virtual void postProgressFinishedNotification() OVERRIDE;
-#else
- virtual void postProgressFinishedNotification() OVERRIDE { }
-#endif
</del><ins>+ virtual void progressStarted(WebCore::Frame&) OVERRIDE;
+ virtual void progressEstimateChanged(WebCore::Frame&) OVERRIDE;
+ virtual void progressFinished(WebCore::Frame&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual void setMainFrameDocumentReady(bool) OVERRIDE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -1029,7 +1029,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::postProgressStartedNotification()
</del><ins>+void WebFrameLoaderClient::progressStarted(WebCore::Frame&)
</ins><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:WebViewProgressStartedNotification object:getWebView(m_webFrame.get())];
</span><span class="lines">@@ -1038,7 +1038,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::postProgressEstimateChangedNotification()
</del><ins>+void WebFrameLoaderClient::progressEstimateChanged(WebCore::Frame&)
</ins><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:WebViewProgressEstimateChangedNotification object:getWebView(m_webFrame.get())];
</span><span class="lines">@@ -1059,12 +1059,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebFrameLoaderClient::progressFinished(WebCore::Frame&)
+{
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><del>-void WebFrameLoaderClient::postProgressFinishedNotification()
-{
</del><span class="cx"> [[NSNotificationCenter defaultCenter] postNotificationName:WebViewProgressFinishedNotification object:getWebView(m_webFrame.get())];
</span><ins>+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WebFrameLoaderClient::setMainFrameDocumentReady(bool ready)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/win/ChangeLog 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-01-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Tweak ProgressTrackerClient functions
+ https://bugs.webkit.org/show_bug.cgi?id=126808
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::progressStarted):
+ (WebFrameLoaderClient::progressEstimateChanged):
+ (WebFrameLoaderClient::progressFinished):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
+2014-01-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126801
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -670,21 +670,21 @@
</span><span class="cx"> m_hasSentResponseToPlugin = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::postProgressStartedNotification()
</del><ins>+void WebFrameLoaderClient::progressStarted(WebCore::Frame&)
</ins><span class="cx"> {
</span><span class="cx"> static BSTR progressStartedName = SysAllocString(WebViewProgressStartedNotification);
</span><span class="cx"> IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
</span><span class="cx"> notifyCenter->postNotificationName(progressStartedName, static_cast<IWebView*>(m_webFrame->webView()), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::postProgressEstimateChangedNotification()
</del><ins>+void WebFrameLoaderClient::progressEstimateChanged(WebCore::Frame&)
</ins><span class="cx"> {
</span><span class="cx"> static BSTR progressEstimateChangedName = SysAllocString(WebViewProgressEstimateChangedNotification);
</span><span class="cx"> IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
</span><span class="cx"> notifyCenter->postNotificationName(progressEstimateChangedName, static_cast<IWebView*>(m_webFrame->webView()), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::postProgressFinishedNotification()
</del><ins>+void WebFrameLoaderClient::progressFinished(WebCore::Frame&)
</ins><span class="cx"> {
</span><span class="cx"> static BSTR progressFinishedName = SysAllocString(WebViewProgressFinishedNotification);
</span><span class="cx"> IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -119,9 +119,9 @@
</span><span class="cx">
</span><span class="cx"> virtual void startDownload(const WebCore::ResourceRequest&, const String& suggestedName = String()) OVERRIDE;
</span><span class="cx">
</span><del>- virtual void postProgressStartedNotification();
- virtual void postProgressEstimateChangedNotification();
- virtual void postProgressFinishedNotification();
</del><ins>+ virtual void progressStarted(WebCore::Frame&);
+ virtual void progressEstimateChanged(WebCore::Frame&);
+ virtual void progressFinished(WebCore::Frame&);
</ins><span class="cx">
</span><span class="cx"> virtual void committedLoad(WebCore::DocumentLoader*, const char*, int) OVERRIDE;
</span><span class="cx"> virtual void finishedLoading(WebCore::DocumentLoader*) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Tweak ProgressTrackerClient functions
+ https://bugs.webkit.org/show_bug.cgi?id=126808
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::progressStarted):
+ (WebKit::WebFrameLoaderClient::progressEstimateChanged):
+ (WebKit::WebFrameLoaderClient::progressFinished):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
</ins><span class="cx"> 2014-01-10 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Convert HandleMessage.h to use variadic templates
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -825,28 +825,28 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::postProgressStartedNotification()
</del><ins>+void WebFrameLoaderClient::progressStarted(Frame& originatingProgressFrame)
</ins><span class="cx"> {
</span><span class="cx"> if (WebPage* webPage = m_frame->page()) {
</span><del>- if (m_frame->isMainFrame())
</del><ins>+ if (originatingProgressFrame.isMainFrame())
</ins><span class="cx"> webPage->send(Messages::WebPageProxy::DidStartProgress());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::postProgressEstimateChangedNotification()
</del><ins>+void WebFrameLoaderClient::progressEstimateChanged(Frame& originatingProgressFrame)
</ins><span class="cx"> {
</span><span class="cx"> if (WebPage* webPage = m_frame->page()) {
</span><del>- if (m_frame->isMainFrame()) {
</del><ins>+ if (originatingProgressFrame.isMainFrame()) {
</ins><span class="cx"> double progress = webPage->corePage()->progress().estimatedProgress();
</span><span class="cx"> webPage->send(Messages::WebPageProxy::DidChangeProgress(progress));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::postProgressFinishedNotification()
</del><ins>+void WebFrameLoaderClient::progressFinished(Frame& originatingProgressFrame)
</ins><span class="cx"> {
</span><span class="cx"> if (WebPage* webPage = m_frame->page()) {
</span><del>- if (m_frame->isMainFrame()) {
</del><ins>+ if (originatingProgressFrame.isMainFrame()) {
</ins><span class="cx"> // Notify the bundle client.
</span><span class="cx"> webPage->injectedBundleLoaderClient().didFinishProgress(webPage);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (161750 => 161751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 07:27:38 UTC (rev 161750)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 07:33:48 UTC (rev 161751)
</span><span class="lines">@@ -119,9 +119,9 @@
</span><span class="cx"> // Maybe these should go into a ProgressTrackerClient some day
</span><span class="cx"> virtual void willChangeEstimatedProgress() OVERRIDE;
</span><span class="cx"> virtual void didChangeEstimatedProgress() OVERRIDE;
</span><del>- virtual void postProgressStartedNotification() OVERRIDE;
- virtual void postProgressEstimateChangedNotification() OVERRIDE;
- virtual void postProgressFinishedNotification() OVERRIDE;
</del><ins>+ virtual void progressStarted(WebCore::Frame&) OVERRIDE;
+ virtual void progressEstimateChanged(WebCore::Frame&) OVERRIDE;
+ virtual void progressFinished(WebCore::Frame&) OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> virtual void setMainFrameDocumentReady(bool) OVERRIDE;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>