<!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>[161744] 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/161744">161744</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 22:33:01 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
https://bugs.webkit.org/show_bug.cgi?id=126801
Reviewed by Sam Weinig.
Source/WebCore:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* loader/EmptyClients.cpp:
(WebCore::fillWithEmptyClients):
* loader/EmptyClients.h:
* loader/FrameLoaderClient.h:
* loader/ProgressTracker.cpp:
(WebCore::ProgressTracker::ProgressTracker):
(WebCore::ProgressTracker::~ProgressTracker):
(WebCore::ProgressTracker::progressStarted):
(WebCore::ProgressTracker::progressCompleted):
(WebCore::ProgressTracker::finalProgressComplete):
(WebCore::ProgressTracker::incrementProgress):
* loader/ProgressTracker.h:
* loader/ProgressTrackerClient.h: Added.
(WebCore::ProgressTrackerClient::~ProgressTrackerClient):
(WebCore::ProgressTrackerClient::progressTrackerDestroyed):
(WebCore::ProgressTrackerClient::willChangeEstimatedProgress):
(WebCore::ProgressTrackerClient::didChangeEstimatedProgress):
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::PageClients::PageClients):
* page/Page.h:
Source/WebKit/efl:
* WebCoreSupport/FrameLoaderClientEfl.h:
* ewk/ewk_view.cpp:
(_ewk_view_priv_new):
Source/WebKit/gtk:
* WebCoreSupport/FrameLoaderClientGtk.h:
* webkit/webkitwebview.cpp:
(webkit_web_view_init):
Source/WebKit/mac:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
Source/WebKit/win:
* WebCoreSupport/WebFrameLoaderClient.h:
* WebView.cpp:
(WebView::initWithFrame):
Source/WebKit2:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientsh">trunk/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoaderClienth">trunk/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackercpp">trunk/Source/WebCore/loader/ProgressTracker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderProgressTrackerh">trunk/Source/WebCore/loader/ProgressTracker.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKiteflChangeLog">trunk/Source/WebKit/efl/ChangeLog</a></li>
<li><a href="#trunkSourceWebKiteflWebCoreSupportFrameLoaderClientEflh">trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h</a></li>
<li><a href="#trunkSourceWebKiteflewkewk_viewcpp">trunk/Source/WebKit/efl/ewk/ewk_view.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkh">trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewcpp">trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp</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="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreloaderProgressTrackerClienth">trunk/Source/WebCore/loader/ProgressTrackerClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
+ https://bugs.webkit.org/show_bug.cgi?id=126801
+
+ Reviewed by Sam Weinig.
+
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * loader/EmptyClients.cpp:
+ (WebCore::fillWithEmptyClients):
+ * loader/EmptyClients.h:
+ * loader/FrameLoaderClient.h:
+ * loader/ProgressTracker.cpp:
+ (WebCore::ProgressTracker::ProgressTracker):
+ (WebCore::ProgressTracker::~ProgressTracker):
+ (WebCore::ProgressTracker::progressStarted):
+ (WebCore::ProgressTracker::progressCompleted):
+ (WebCore::ProgressTracker::finalProgressComplete):
+ (WebCore::ProgressTracker::incrementProgress):
+ * loader/ProgressTracker.h:
+ * loader/ProgressTrackerClient.h: Added.
+ (WebCore::ProgressTrackerClient::~ProgressTrackerClient):
+ (WebCore::ProgressTrackerClient::progressTrackerDestroyed):
+ (WebCore::ProgressTrackerClient::willChangeEstimatedProgress):
+ (WebCore::ProgressTrackerClient::didChangeEstimatedProgress):
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::PageClients::PageClients):
+ * page/Page.h:
+
</ins><span class="cx"> 2014-01-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix RenderObject.o for iOS. Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -4027,6 +4027,7 @@
</span><span class="cx"> Source/WebCore/loader/PolicyChecker.h \
</span><span class="cx"> Source/WebCore/loader/ProgressTracker.cpp \
</span><span class="cx"> Source/WebCore/loader/ProgressTracker.h \
</span><ins>+ Source/WebCore/loader/ProgressTrackerClient.h \
</ins><span class="cx"> Source/WebCore/loader/NavigationScheduler.cpp \
</span><span class="cx"> Source/WebCore/loader/NavigationScheduler.h \
</span><span class="cx"> Source/WebCore/loader/ResourceBuffer.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -18959,6 +18959,7 @@
</span><span class="cx"> <ClInclude Include="..\loader\PolicyCallback.h" />
</span><span class="cx"> <ClInclude Include="..\loader\PolicyChecker.h" />
</span><span class="cx"> <ClInclude Include="..\loader\ProgressTracker.h" />
</span><ins>+ <ClInclude Include="..\loader\ProgressTrackerClient.h" />
</ins><span class="cx"> <ClInclude Include="..\loader\ResourceBuffer.h" />
</span><span class="cx"> <ClInclude Include="..\loader\ResourceLoader.h" />
</span><span class="cx"> <ClInclude Include="..\loader\ResourceLoaderOptions.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -7838,6 +7838,9 @@
</span><span class="cx"> <ClInclude Include="..\loader\ProgressTracker.h">
</span><span class="cx"> <Filter>loader</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\loader\ProgressTrackerClient.h">
+ <Filter>loader</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\loader\ResourceBuffer.h">
</span><span class="cx"> <Filter>loader</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -783,6 +783,7 @@
</span><span class="cx"> 1AC2260D0DB69F190089B669 /* JSDOMApplicationCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC2260B0DB69F190089B669 /* JSDOMApplicationCache.h */; };
</span><span class="cx"> 1AC2D845171734A100652FC0 /* Storage.h in Headers */ = {isa = PBXBuildFile; fileRef = 51E3F9C40DA059DC00250911 /* Storage.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AC69593161A1E53003732CB /* GraphicsLayerFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC69592161A1E53003732CB /* GraphicsLayerFactory.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 1ACADD791880D91C00D8B71D /* ProgressTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACADD781880D91C00D8B71D /* ProgressTrackerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1ACD1B630B029739007E5016 /* DOMCSSStyleDeclarationInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85E711440AC5D5340053270F /* DOMCSSStyleDeclarationInternal.h */; };
</span><span class="cx"> 1ACE53DF0A8D18810022947D /* JSDOMParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ACE53DD0A8D18810022947D /* JSDOMParser.cpp */; };
</span><span class="cx"> 1ACE53E00A8D18810022947D /* JSDOMParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACE53DE0A8D18810022947D /* JSDOMParser.h */; };
</span><span class="lines">@@ -7582,6 +7583,7 @@
</span><span class="cx"> 1AC2260A0DB69F190089B669 /* JSDOMApplicationCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMApplicationCache.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AC2260B0DB69F190089B669 /* JSDOMApplicationCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMApplicationCache.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AC69592161A1E53003732CB /* GraphicsLayerFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsLayerFactory.h; sourceTree = "<group>"; };
</span><ins>+ 1ACADD781880D91C00D8B71D /* ProgressTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProgressTrackerClient.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1ACE53DD0A8D18810022947D /* JSDOMParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMParser.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1ACE53DE0A8D18810022947D /* JSDOMParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSDOMParser.h; sourceTree = "<group>"; };
</span><span class="cx"> 1ACE53E10A8D18E70022947D /* DOMParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DOMParser.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -20656,6 +20658,7 @@
</span><span class="cx"> 97059976107D975200A50A7C /* PolicyChecker.h */,
</span><span class="cx"> 1A2A68210B5BEDE70002A480 /* ProgressTracker.cpp */,
</span><span class="cx"> 1A2A68220B5BEDE70002A480 /* ProgressTracker.h */,
</span><ins>+ 1ACADD781880D91C00D8B71D /* ProgressTrackerClient.h */,
</ins><span class="cx"> 514BC840161CF05C004D52F4 /* ResourceBuffer.cpp */,
</span><span class="cx"> 514BC841161CF05C004D52F4 /* ResourceBuffer.h */,
</span><span class="cx"> 93E227DE0AF589AD00D48324 /* ResourceLoader.cpp */,
</span><span class="lines">@@ -24651,6 +24654,7 @@
</span><span class="cx"> E18256900EF2B02D00933242 /* JSWorkerGlobalScope.h in Headers */,
</span><span class="cx"> E1C36D350EB0A094007410BC /* JSWorkerGlobalScopeBase.h in Headers */,
</span><span class="cx"> E1C362EF0EAF2AA9007410BC /* JSWorkerLocation.h in Headers */,
</span><ins>+ 1ACADD791880D91C00D8B71D /* ProgressTrackerClient.h in Headers */,
</ins><span class="cx"> E1271A580EEECDE400F61213 /* JSWorkerNavigator.h in Headers */,
</span><span class="cx"> BC348BD40DB7F804004ABAB9 /* JSXMLHttpRequest.h in Headers */,
</span><span class="cx"> BC60DA3A0D2A302800B9918F /* JSXMLHttpRequestException.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -66,6 +66,9 @@
</span><span class="cx">
</span><span class="cx"> static NeverDestroyed<EmptyFrameLoaderClient> dummyFrameLoaderClient;
</span><span class="cx"> pageClients.loaderClientForMainFrame = &dummyFrameLoaderClient.get();
</span><ins>+
+ static NeverDestroyed<EmptyProgressTrackerClient> dummyProgressTrackerClient;
+ pageClients.progressTrackerClient = &dummyProgressTrackerClient.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class EmptyPopupMenu : public PopupMenu {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.h (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.h 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "Page.h"
</span><ins>+#include "ProgressTrackerClient.h"
</ins><span class="cx"> #include "ResourceError.h"
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx">
</span><span class="lines">@@ -316,12 +317,6 @@
</span><span class="cx"> virtual void revertToProvisionalState(DocumentLoader*) OVERRIDE { }
</span><span class="cx"> virtual void setMainDocumentError(DocumentLoader*, const ResourceError&) OVERRIDE { }
</span><span class="cx">
</span><del>- virtual void willChangeEstimatedProgress() OVERRIDE { }
- virtual void didChangeEstimatedProgress() OVERRIDE { }
- virtual void postProgressStartedNotification() OVERRIDE { }
- virtual void postProgressEstimateChangedNotification() OVERRIDE { }
- virtual void postProgressFinishedNotification() OVERRIDE { }
-
</del><span class="cx"> virtual void setMainFrameDocumentReady(bool) OVERRIDE { }
</span><span class="cx">
</span><span class="cx"> virtual void startDownload(const ResourceRequest&, const String& suggestedName = String()) OVERRIDE { UNUSED_PARAM(suggestedName); }
</span><span class="lines">@@ -638,6 +633,14 @@
</span><span class="cx"> virtual void deviceOrientationControllerDestroyed() OVERRIDE { }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class EmptyProgressTrackerClient : public ProgressTrackerClient {
+ virtual void willChangeEstimatedProgress() OVERRIDE { }
+ virtual void didChangeEstimatedProgress() OVERRIDE { }
+ virtual void postProgressStartedNotification() OVERRIDE { }
+ virtual void postProgressEstimateChangedNotification() OVERRIDE { }
+ virtual void postProgressFinishedNotification() OVERRIDE { }
+};
+
</ins><span class="cx"> void fillWithEmptyClients(Page::PageClients&);
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -187,13 +187,6 @@
</span><span class="cx"> virtual void revertToProvisionalState(DocumentLoader*) = 0;
</span><span class="cx"> virtual void setMainDocumentError(DocumentLoader*, const ResourceError&) = 0;
</span><span class="cx">
</span><del>- // Maybe these should go into a ProgressTrackerClient some day
- virtual void willChangeEstimatedProgress() { }
- virtual void didChangeEstimatedProgress() { }
- virtual void postProgressStartedNotification() = 0;
- virtual void postProgressEstimateChangedNotification() = 0;
- virtual void postProgressFinishedNotification() = 0;
-
</del><span class="cx"> virtual void setMainFrameDocumentReady(bool) = 0;
</span><span class="cx">
</span><span class="cx"> virtual void startDownload(const ResourceRequest&, const String& suggestedName = String()) = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.cpp (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/loader/ProgressTracker.cpp 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "ProgressTrackerClient.h"
</ins><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="lines">@@ -69,8 +70,9 @@
</span><span class="cx">
</span><span class="cx"> unsigned long ProgressTracker::s_uniqueIdentifier = 0;
</span><span class="cx">
</span><del>-ProgressTracker::ProgressTracker()
- : m_totalPageAndResourceBytesToLoad(0)
</del><ins>+ProgressTracker::ProgressTracker(ProgressTrackerClient& client)
+ : m_client(client)
+ , m_totalPageAndResourceBytesToLoad(0)
</ins><span class="cx"> , m_totalBytesReceived(0)
</span><span class="cx"> , m_lastNotifiedProgressValue(0)
</span><span class="cx"> , m_lastNotifiedProgressTime(0)
</span><span class="lines">@@ -87,6 +89,7 @@
</span><span class="cx">
</span><span class="cx"> ProgressTracker::~ProgressTracker()
</span><span class="cx"> {
</span><ins>+ m_client.progressTrackerDestroyed();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double ProgressTracker::estimatedProgress() const
</span><span class="lines">@@ -116,7 +119,7 @@
</span><span class="cx"> {
</span><span class="cx"> LOG(Progress, "Progress started (%p) - frame %p(\"%s\"), value %f, tracked frames %d, originating frame %p", this, &frame, frame.tree().uniqueName().string().utf8().data(), m_progressValue, m_numProgressTrackedFrames, m_originatingProgressFrame.get());
</span><span class="cx">
</span><del>- frame.loader().client().willChangeEstimatedProgress();
</del><ins>+ m_client.willChangeEstimatedProgress();
</ins><span class="cx">
</span><span class="cx"> if (!m_numProgressTrackedFrames || m_originatingProgressFrame == &frame) {
</span><span class="cx"> reset();
</span><span class="lines">@@ -126,11 +129,11 @@
</span><span class="cx"> m_progressHeartbeatTimer.startRepeating(progressHeartbeatInterval);
</span><span class="cx"> m_originatingProgressFrame->loader().loadProgressingStatusChanged();
</span><span class="cx">
</span><del>- m_originatingProgressFrame->loader().client().postProgressStartedNotification();
</del><ins>+ m_client.postProgressStartedNotification();
</ins><span class="cx"> }
</span><span class="cx"> m_numProgressTrackedFrames++;
</span><span class="cx">
</span><del>- frame.loader().client().didChangeEstimatedProgress();
</del><ins>+ m_client.didChangeEstimatedProgress();
</ins><span class="cx"> InspectorInstrumentation::frameStartedLoading(frame);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -141,13 +144,13 @@
</span><span class="cx"> if (m_numProgressTrackedFrames <= 0)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- frame.loader().client().willChangeEstimatedProgress();
</del><ins>+ m_client.willChangeEstimatedProgress();
</ins><span class="cx">
</span><span class="cx"> m_numProgressTrackedFrames--;
</span><span class="cx"> if (!m_numProgressTrackedFrames || m_originatingProgressFrame == &frame)
</span><span class="cx"> finalProgressComplete();
</span><span class="cx">
</span><del>- frame.loader().client().didChangeEstimatedProgress();
</del><ins>+ m_client.didChangeEstimatedProgress();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ProgressTracker::finalProgressComplete()
</span><span class="lines">@@ -160,13 +163,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>- frame->loader().client().postProgressEstimateChangedNotification();
</del><ins>+ m_client.postProgressEstimateChangedNotification();
</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>- frame->loader().client().postProgressFinishedNotification();
</del><ins>+ m_client.postProgressFinishedNotification();
</ins><span class="cx"> frame->loader().loadProgressingStatusChanged();
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::frameStoppedLoading(*frame);
</span><span class="lines">@@ -205,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Frame> frame = m_originatingProgressFrame;
</span><span class="cx">
</span><del>- frame->loader().client().willChangeEstimatedProgress();
</del><ins>+ m_client.willChangeEstimatedProgress();
</ins><span class="cx">
</span><span class="cx"> double increment, percentOfRemainingBytes;
</span><span class="cx"> long long remainingBytes, estimatedBytesForPendingRequests;
</span><span class="lines">@@ -248,14 +251,14 @@
</span><span class="cx"> if (m_progressValue == 1)
</span><span class="cx"> m_finalProgressChangedSent = true;
</span><span class="cx">
</span><del>- frame->loader().client().postProgressEstimateChangedNotification();
</del><ins>+ m_client.postProgressEstimateChangedNotification();
</ins><span class="cx">
</span><span class="cx"> m_lastNotifiedProgressValue = m_progressValue;
</span><span class="cx"> m_lastNotifiedProgressTime = now;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- frame->loader().client().didChangeEstimatedProgress();
</del><ins>+ m_client.didChangeEstimatedProgress();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ProgressTracker::completeProgress(unsigned long identifier)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ProgressTracker.h (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTracker.h 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/loader/ProgressTracker.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -37,12 +37,13 @@
</span><span class="cx">
</span><span class="cx"> class Frame;
</span><span class="cx"> class ResourceResponse;
</span><ins>+class ProgressTrackerClient;
</ins><span class="cx"> struct ProgressItem;
</span><span class="cx">
</span><span class="cx"> class ProgressTracker {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ProgressTracker); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- ProgressTracker();
</del><ins>+ explicit ProgressTracker(ProgressTrackerClient&);
</ins><span class="cx"> ~ProgressTracker();
</span><span class="cx">
</span><span class="cx"> static unsigned long createUniqueIdentifier();
</span><span class="lines">@@ -69,6 +70,7 @@
</span><span class="cx">
</span><span class="cx"> static unsigned long s_uniqueIdentifier;
</span><span class="cx">
</span><ins>+ ProgressTrackerClient& m_client;
</ins><span class="cx"> long long m_totalPageAndResourceBytesToLoad;
</span><span class="cx"> long long m_totalBytesReceived;
</span><span class="cx"> double m_lastNotifiedProgressValue;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderProgressTrackerClienth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/loader/ProgressTrackerClient.h (0 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ProgressTrackerClient.h (rev 0)
+++ trunk/Source/WebCore/loader/ProgressTrackerClient.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ProgressTrackerClient_h
+#define ProgressTrackerClient_h
+
+namespace WebCore {
+
+class ProgressTrackerClient {
+protected:
+ virtual ~ProgressTrackerClient() { }
+
+public:
+ virtual void progressTrackerDestroyed() { }
+
+ virtual void willChangeEstimatedProgress() { }
+ virtual void didChangeEstimatedProgress() { }
+ virtual void postProgressStartedNotification() = 0;
+ virtual void postProgressEstimateChangedNotification() = 0;
+ virtual void postProgressFinishedNotification() = 0;
+};
+
+} // namespace WebCore
+
+#endif // ProgressTrackerClient_h
</ins></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/page/Page.cpp 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> , m_pointerLockController(PointerLockController::create(this))
</span><span class="cx"> #endif
</span><span class="cx"> , m_settings(Settings::create(this))
</span><del>- , m_progress(std::make_unique<ProgressTracker>())
</del><ins>+ , m_progress(std::make_unique<ProgressTracker>(*pageClients.progressTrackerClient))
</ins><span class="cx"> , m_backForwardController(std::make_unique<BackForwardController>(*this, pageClients.backForwardClient))
</span><span class="cx"> , m_mainFrame(MainFrame::create(*this, *pageClients.loaderClientForMainFrame))
</span><span class="cx"> , m_theme(RenderTheme::themeForPage(this))
</span><span class="lines">@@ -1601,17 +1601,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Page::PageClients::PageClients()
</span><del>- : alternativeTextClient(0)
- , chromeClient(0)
</del><ins>+ : alternativeTextClient(nullptr)
+ , chromeClient(nullptr)
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>- , contextMenuClient(0)
</del><ins>+ , contextMenuClient(nullptr)
</ins><span class="cx"> #endif
</span><del>- , editorClient(0)
- , dragClient(0)
- , inspectorClient(0)
- , plugInClient(0)
- , validationMessageClient(0)
- , loaderClientForMainFrame(0)
</del><ins>+ , editorClient(nullptr)
+ , dragClient(nullptr)
+ , inspectorClient(nullptr)
+ , plugInClient(nullptr)
+ , progressTrackerClient(nullptr)
+ , validationMessageClient(nullptr)
+ , loaderClientForMainFrame(nullptr)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebCore/page/Page.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx"> class PluginViewBase;
</span><span class="cx"> class PointerLockController;
</span><span class="cx"> class ProgressTracker;
</span><ins>+class ProgressTrackerClient;
</ins><span class="cx"> class Range;
</span><span class="cx"> class RenderObject;
</span><span class="cx"> class RenderTheme;
</span><span class="lines">@@ -134,6 +135,7 @@
</span><span class="cx"> DragClient* dragClient;
</span><span class="cx"> InspectorClient* inspectorClient;
</span><span class="cx"> PlugInClient* plugInClient;
</span><ins>+ ProgressTrackerClient* progressTrackerClient;
</ins><span class="cx"> RefPtr<BackForwardClient> backForwardClient;
</span><span class="cx"> ValidationMessageClient* validationMessageClient;
</span><span class="cx"> FrameLoaderClient* loaderClientForMainFrame;
</span></span></pre></div>
<a id="trunkSourceWebKiteflChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ChangeLog (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ChangeLog 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/efl/ChangeLog 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
+ https://bugs.webkit.org/show_bug.cgi?id=126801
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/FrameLoaderClientEfl.h:
+ * ewk/ewk_view.cpp:
+ (_ewk_view_priv_new):
+
</ins><span class="cx"> 2014-01-08 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Merge ewk_view_single into ewk_view
</span></span></pre></div>
<a id="trunkSourceWebKiteflWebCoreSupportFrameLoaderClientEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "EWebKit.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><span class="cx"> #include "PluginView.h"
</span><ins>+#include "ProgressTrackerClient.h"
</ins><span class="cx"> #include "ResourceError.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx">
</span><span class="lines">@@ -43,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> class FormState;
</span><span class="cx">
</span><del>-class FrameLoaderClientEfl : public FrameLoaderClient {
</del><ins>+class FrameLoaderClientEfl : public FrameLoaderClient, public ProgressTrackerClient {
</ins><span class="cx"> public:
</span><span class="cx"> explicit FrameLoaderClientEfl(Evas_Object *view);
</span><span class="cx"> virtual ~FrameLoaderClientEfl() { }
</span></span></pre></div>
<a id="trunkSourceWebKiteflewkewk_viewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/efl/ewk/ewk_view.cpp (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/efl/ewk/ewk_view.cpp 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -683,6 +683,7 @@
</span><span class="cx"> pageClients.inspectorClient = new WebCore::InspectorClientEfl(smartData->self);
</span><span class="cx"> #endif
</span><span class="cx"> pageClients.loaderClientForMainFrame = new WebCore::FrameLoaderClientEfl(smartData->self);
</span><ins>+ pageClients.progressTrackerClient = static_cast<WebCore::FrameLoaderClientEfl*>(pageClients.loaderClientForMainFrame);
</ins><span class="cx"> priv->page = adoptPtr(new WebCore::Page(pageClients));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DEVICE_ORIENTATION)
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
+ https://bugs.webkit.org/show_bug.cgi?id=126801
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/FrameLoaderClientGtk.h:
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_init):
+
</ins><span class="cx"> 2014-01-08 Claudio Saavedra <csaavedra@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add xdg.origin.url extended attribute to downloads
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #define FrameLoaderClientGtk_h
</span><span class="cx">
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><ins>+#include "ProgressTrackerClient.h"
</ins><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "webkitwebpolicydecision.h"
</span><span class="cx">
</span><span class="lines">@@ -42,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>- class FrameLoaderClient : public WebCore::FrameLoaderClient {
</del><ins>+ class FrameLoaderClient : public WebCore::FrameLoaderClient, public WebCore::ProgressTrackerClient {
</ins><span class="cx"> public:
</span><span class="cx"> FrameLoaderClient(WebKitWebFrame* = 0);
</span><span class="cx"> virtual ~FrameLoaderClient();
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -3810,6 +3810,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> pageClients.inspectorClient = new WebKit::InspectorClient(webView);
</span><span class="cx"> pageClients.loaderClientForMainFrame = new WebKit::FrameLoaderClient;
</span><ins>+ pageClients.progressTrackerClient = static_cast<WebKit::FrameLoaderClient*>(pageClients.loaderClientForMainFrame);
</ins><span class="cx">
</span><span class="cx"> priv->corePage = new Page(pageClients);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
+ https://bugs.webkit.org/show_bug.cgi?id=126801
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+
</ins><span class="cx"> 2014-01-10 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up architectures in xcconfig files
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <WebCore/FrameLoaderClient.h>
</span><ins>+#import <WebCore/ProgressTrackerClient.h>
</ins><span class="cx"> #import <WebCore/Timer.h>
</span><span class="cx"> #import <wtf/Forward.h>
</span><span class="cx"> #import <wtf/HashMap.h>
</span><span class="lines">@@ -49,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> typedef HashMap<RefPtr<WebCore::ResourceLoader>, RetainPtr<WebResource>> ResourceMap;
</span><span class="cx">
</span><del>-class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
</del><ins>+class WebFrameLoaderClient : public WebCore::FrameLoaderClient, public WebCore::ProgressTrackerClient {
</ins><span class="cx"> public:
</span><span class="cx"> WebFrameLoaderClient(WebFrame* = 0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -979,6 +979,7 @@
</span><span class="cx"> pageClients.editorClient = new WebEditorClient(self);
</span><span class="cx"> pageClients.alternativeTextClient = new WebAlternativeTextClient(self);
</span><span class="cx"> pageClients.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><ins>+ pageClients.progressTrackerClient = static_cast<WebFrameLoaderClient*>(pageClients.loaderClientForMainFrame);
</ins><span class="cx"> _private->page = new Page(pageClients);
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx"> WebCore::provideGeolocationTo(_private->page, new WebGeolocationClient(self));
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/win/ChangeLog 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-10 Anders Carlsson <andersca@apple.com>
+
+ Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
+ https://bugs.webkit.org/show_bug.cgi?id=126801
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebView.cpp:
+ (WebView::initWithFrame):
+
</ins><span class="cx"> 2014-01-08 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Compile error.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/COMPtr.h>
</span><span class="cx"> #include <WebCore/FrameLoaderClient.h>
</span><ins>+#include <WebCore/ProgressTrackerClient.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class PluginManualLoader;
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> class WebFramePolicyListener;
</span><span class="cx"> class WebHistory;
</span><span class="cx">
</span><del>-class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
</del><ins>+class WebFrameLoaderClient : public WebCore::FrameLoaderClient, public WebCore::ProgressTrackerClient {
</ins><span class="cx"> public:
</span><span class="cx"> WebFrameLoaderClient(WebFrame* = 0);
</span><span class="cx"> ~WebFrameLoaderClient();
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -2772,6 +2772,7 @@
</span><span class="cx"> pageClients.inspectorClient = m_inspectorClient;
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx"> pageClients.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><ins>+ pageClients.progressTrackerClient = static_cast<WebFrameLoaderClient*>(pageClients.loaderClientForMainFrame);
</ins><span class="cx">
</span><span class="cx"> m_page = new Page(pageClients);
</span><span class="cx"> provideGeolocationTo(m_page, new WebGeolocationClient(this));
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-01-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
+ https://bugs.webkit.org/show_bug.cgi?id=126801
+
+ Reviewed by Sam Weinig.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+
+2014-01-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove dead code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126782
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -27,13 +27,14 @@
</span><span class="cx"> #define WebFrameLoaderClient_h
</span><span class="cx">
</span><span class="cx"> #include <WebCore/FrameLoaderClient.h>
</span><ins>+#include <WebCore/ProgressTrackerClient.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class PluginView;
</span><span class="cx"> class WebFrame;
</span><span class="cx">
</span><del>-class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
</del><ins>+class WebFrameLoaderClient : public WebCore::FrameLoaderClient, public WebCore::ProgressTrackerClient {
</ins><span class="cx"> public:
</span><span class="cx"> WebFrameLoaderClient();
</span><span class="cx"> ~WebFrameLoaderClient();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (161743 => 161744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-11 06:18:35 UTC (rev 161743)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-01-11 06:33:01 UTC (rev 161744)
</span><span class="lines">@@ -309,6 +309,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> pageClients.plugInClient = new WebPlugInClient(this);
</span><span class="cx"> pageClients.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><ins>+ pageClients.progressTrackerClient = static_cast<WebFrameLoaderClient*>(pageClients.loaderClientForMainFrame);
</ins><span class="cx">
</span><span class="cx"> m_page = adoptPtr(new Page(pageClients));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>