<!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>[160137] trunk</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/160137">160137</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-04 15:43:37 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the estimatedProgress property observable using KVO
https://bugs.webkit.org/show_bug.cgi?id=125259
Reviewed by Dan Bernstein.
Source/WebKit2:
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
* UIProcess/PageLoadState.cpp:
(WebKit::PageLoadState::PageLoadState):
(WebKit::PageLoadState::reset):
(WebKit::PageLoadState::activeURL):
(WebKit::PageLoadState::estimatedProgress):
(WebKit::PageLoadState::setPendingAPIRequestURL):
(WebKit::PageLoadState::clearPendingAPIRequestURL):
(WebKit::PageLoadState::didStartProgress):
(WebKit::PageLoadState::didChangeProgress):
(WebKit::PageLoadState::didFinishProgress):
* UIProcess/PageLoadState.h:
Move m_estimatedProgress to the page load state and call the observers when it changes.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::estimatedProgress):
(WebKit::WebPageProxy::didStartProgress):
(WebKit::WebPageProxy::didChangeProgress):
(WebKit::WebPageProxy::didFinishProgress):
(WebKit::WebPageProxy::resetState):
Call through to m_pageLoadState.
* UIProcess/WebPageProxy.h:
Tools:
Bind the progress indicator value to the "estimatedProgress" property.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController dealloc]):
(-[WK2BrowserWindowController awakeFromNib]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageLoadStatecpp">trunk/Source/WebKit2/UIProcess/PageLoadState.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageLoadStateh">trunk/Source/WebKit2/UIProcess/PageLoadState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160136 => 160137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-04 23:26:33 UTC (rev 160136)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-04 23:43:37 UTC (rev 160137)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2013-12-04 Anders Carlsson <andersca@apple.com>
+
+ Make the estimatedProgress property observable using KVO
+ https://bugs.webkit.org/show_bug.cgi?id=125259
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ * UIProcess/PageLoadState.cpp:
+ (WebKit::PageLoadState::PageLoadState):
+ (WebKit::PageLoadState::reset):
+ (WebKit::PageLoadState::activeURL):
+ (WebKit::PageLoadState::estimatedProgress):
+ (WebKit::PageLoadState::setPendingAPIRequestURL):
+ (WebKit::PageLoadState::clearPendingAPIRequestURL):
+ (WebKit::PageLoadState::didStartProgress):
+ (WebKit::PageLoadState::didChangeProgress):
+ (WebKit::PageLoadState::didFinishProgress):
+ * UIProcess/PageLoadState.h:
+ Move m_estimatedProgress to the page load state and call the observers when it changes.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::estimatedProgress):
+ (WebKit::WebPageProxy::didStartProgress):
+ (WebKit::WebPageProxy::didChangeProgress):
+ (WebKit::WebPageProxy::didFinishProgress):
+ (WebKit::WebPageProxy::resetState):
+ Call through to m_pageLoadState.
+
+ * UIProcess/WebPageProxy.h:
+
</ins><span class="cx"> 2013-12-04 Nick Diego Yamane <nick.yamane@openbossa.org>
</span><span class="cx">
</span><span class="cx"> [WK2] Including SecItemShim.h should be guarded by ENABLE(SEC_ITEM_SHIM)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (160136 => 160137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-04 23:26:33 UTC (rev 160136)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-04 23:43:37 UTC (rev 160137)
</span><span class="lines">@@ -81,6 +81,16 @@
</span><span class="cx"> [m_controller didChangeValueForKey:@"title"];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ virtual void willChangeEstimatedProgress() OVERRIDE
+ {
+ [m_controller willChangeValueForKey:@"estimatedProgress"];
+ }
+
+ virtual void didChangeEstimatedProgress() OVERRIDE
+ {
+ [m_controller didChangeValueForKey:@"estimatedProgress"];
+ }
+
</ins><span class="cx"> WKBrowsingContextController *m_controller;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageLoadStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.cpp (160136 => 160137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-12-04 23:26:33 UTC (rev 160136)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-12-04 23:43:37 UTC (rev 160137)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> PageLoadState::PageLoadState()
</span><span class="cx"> : m_state(State::Finished)
</span><ins>+ , m_estimatedProgress(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -67,6 +68,10 @@
</span><span class="cx"> callObserverCallback(&Observer::willChangeTitle);
</span><span class="cx"> m_title = String();
</span><span class="cx"> callObserverCallback(&Observer::didChangeTitle);
</span><ins>+
+ callObserverCallback(&Observer::willChangeEstimatedProgress);
+ m_estimatedProgress = 0;
+ callObserverCallback(&Observer::didChangeEstimatedProgress);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PageLoadState::isLoading() const
</span><span class="lines">@@ -95,7 +100,19 @@
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return String();
</span><ins>+}
</ins><span class="cx">
</span><ins>+// Always start progress at initialProgressValue. This helps provide feedback as
+// soon as a load starts.
+
+static const double initialProgressValue = 0.1;
+
+double PageLoadState::estimatedProgress() const
+{
+ if (!m_pendingAPIRequestURL.isNull())
+ return initialProgressValue;
+
+ return m_estimatedProgress;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const String& PageLoadState::pendingAPIRequestURL() const
</span><span class="lines">@@ -105,12 +122,16 @@
</span><span class="cx">
</span><span class="cx"> void PageLoadState::setPendingAPIRequestURL(const String& pendingAPIRequestURL)
</span><span class="cx"> {
</span><ins>+ callObserverCallback(&Observer::willChangeEstimatedProgress);
</ins><span class="cx"> m_pendingAPIRequestURL = pendingAPIRequestURL;
</span><ins>+ callObserverCallback(&Observer::didChangeEstimatedProgress);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageLoadState::clearPendingAPIRequestURL()
</span><span class="cx"> {
</span><ins>+ callObserverCallback(&Observer::willChangeEstimatedProgress);
</ins><span class="cx"> m_pendingAPIRequestURL = String();
</span><ins>+ callObserverCallback(&Observer::didChangeEstimatedProgress);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageLoadState::didStartProvisionalLoad(const String& url, const String& unreachableURL)
</span><span class="lines">@@ -193,6 +214,27 @@
</span><span class="cx"> callObserverCallback(&Observer::didChangeTitle);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageLoadState::didStartProgress()
+{
+ callObserverCallback(&Observer::willChangeEstimatedProgress);
+ m_estimatedProgress = initialProgressValue;
+ callObserverCallback(&Observer::didChangeEstimatedProgress);
+}
+
+void PageLoadState::didChangeProgress(double value)
+{
+ callObserverCallback(&Observer::willChangeEstimatedProgress);
+ m_estimatedProgress = value;
+ callObserverCallback(&Observer::didChangeEstimatedProgress);
+}
+
+void PageLoadState::didFinishProgress()
+{
+ callObserverCallback(&Observer::willChangeEstimatedProgress);
+ m_estimatedProgress = 1;
+ callObserverCallback(&Observer::didChangeEstimatedProgress);
+}
+
</ins><span class="cx"> bool PageLoadState::isLoadingState(State state)
</span><span class="cx"> {
</span><span class="cx"> switch (state) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageLoadStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.h (160136 => 160137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageLoadState.h 2013-12-04 23:26:33 UTC (rev 160136)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.h 2013-12-04 23:43:37 UTC (rev 160137)
</span><span class="lines">@@ -50,6 +50,9 @@
</span><span class="cx">
</span><span class="cx"> virtual void willChangeTitle() = 0;
</span><span class="cx"> virtual void didChangeTitle() = 0;
</span><ins>+
+ virtual void willChangeEstimatedProgress() = 0;
+ virtual void didChangeEstimatedProgress() = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void addObserver(Observer&);
</span><span class="lines">@@ -65,6 +68,8 @@
</span><span class="cx">
</span><span class="cx"> String activeURL() const;
</span><span class="cx">
</span><ins>+ double estimatedProgress() const;
+
</ins><span class="cx"> const String& pendingAPIRequestURL() const;
</span><span class="cx"> void setPendingAPIRequestURL(const String&);
</span><span class="cx"> void clearPendingAPIRequestURL();
</span><span class="lines">@@ -84,6 +89,10 @@
</span><span class="cx"> const String& title() const;
</span><span class="cx"> void setTitle(const String&);
</span><span class="cx">
</span><ins>+ void didStartProgress();
+ void didChangeProgress(double);
+ void didFinishProgress();
+
</ins><span class="cx"> private:
</span><span class="cx"> static bool isLoadingState(State);
</span><span class="cx"> void setState(State);
</span><span class="lines">@@ -103,6 +112,8 @@
</span><span class="cx"> String m_lastUnreachableURL;
</span><span class="cx">
</span><span class="cx"> String m_title;
</span><ins>+
+ double m_estimatedProgress;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (160136 => 160137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-04 23:26:33 UTC (rev 160136)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-04 23:43:37 UTC (rev 160137)
</span><span class="lines">@@ -235,7 +235,6 @@
</span><span class="cx"> , m_userAgent(standardUserAgent())
</span><span class="cx"> , m_geolocationPermissionRequestManager(*this)
</span><span class="cx"> , m_notificationPermissionRequestManager(*this)
</span><del>- , m_estimatedProgress(0)
</del><span class="cx"> , m_viewState(ViewState::NoFlags)
</span><span class="cx"> , m_backForwardList(WebBackForwardList::create(*this))
</span><span class="cx"> , m_loadStateAtProcessExit(FrameLoadState::State::Finished)
</span><span class="lines">@@ -2039,36 +2038,28 @@
</span><span class="cx"> m_process->frameCreated(frameID, subFrame.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Always start progress at initialProgressValue. This helps provide feedback as
-// soon as a load starts.
-
-static const double initialProgressValue = 0.1;
-
</del><span class="cx"> double WebPageProxy::estimatedProgress() const
</span><span class="cx"> {
</span><del>- if (!m_pageLoadState.pendingAPIRequestURL().isNull())
- return initialProgressValue;
-
- return m_estimatedProgress;
</del><ins>+ return m_pageLoadState.estimatedProgress();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didStartProgress()
</span><span class="cx"> {
</span><del>- m_estimatedProgress = initialProgressValue;
</del><ins>+ m_pageLoadState.didStartProgress();
</ins><span class="cx">
</span><span class="cx"> m_loaderClient.didStartProgress(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didChangeProgress(double value)
</span><span class="cx"> {
</span><del>- m_estimatedProgress = value;
</del><ins>+ m_pageLoadState.didChangeProgress(value);
</ins><span class="cx">
</span><span class="cx"> m_loaderClient.didChangeProgress(this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didFinishProgress()
</span><span class="cx"> {
</span><del>- m_estimatedProgress = 1.0;
</del><ins>+ m_pageLoadState.didFinishProgress();
</ins><span class="cx">
</span><span class="cx"> m_loaderClient.didFinishProgress(this);
</span><span class="cx"> }
</span><span class="lines">@@ -3757,8 +3748,6 @@
</span><span class="cx"> editCommandVector[i]->invalidate();
</span><span class="cx">
</span><span class="cx"> m_activePopupMenu = 0;
</span><del>-
- m_estimatedProgress = 0.0;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::resetStateAfterProcessExited()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (160136 => 160137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-04 23:26:33 UTC (rev 160136)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-04 23:43:37 UTC (rev 160137)
</span><span class="lines">@@ -1206,8 +1206,6 @@
</span><span class="cx"> GeolocationPermissionRequestManagerProxy m_geolocationPermissionRequestManager;
</span><span class="cx"> NotificationPermissionRequestManagerProxy m_notificationPermissionRequestManager;
</span><span class="cx">
</span><del>- double m_estimatedProgress;
-
</del><span class="cx"> ViewState::Flags m_viewState;
</span><span class="cx">
</span><span class="cx"> bool m_canGoBack;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160136 => 160137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-04 23:26:33 UTC (rev 160136)
+++ trunk/Tools/ChangeLog 2013-12-04 23:43:37 UTC (rev 160137)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2013-12-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Make the estimatedProgress property observable using KVO
+ https://bugs.webkit.org/show_bug.cgi?id=125259
+
+ Reviewed by Dan Bernstein.
+
+ Bind the progress indicator value to the "estimatedProgress" property.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController dealloc]):
+ (-[WK2BrowserWindowController awakeFromNib]):
+
+2013-12-04 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add a loading property to WKBrowsingContextController
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125256
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (160136 => 160137)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-04 23:26:33 UTC (rev 160136)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-04 23:43:37 UTC (rev 160137)
</span><span class="lines">@@ -36,9 +36,6 @@
</span><span class="cx"> #import <WebKit2/WKViewPrivate.h>
</span><span class="cx">
</span><span class="cx"> @interface WK2BrowserWindowController () <WKBrowsingContextPolicyDelegate>
</span><del>-- (void)didStartProgress;
-- (void)didChangeProgress:(double)value;
-- (void)didFinishProgress;
</del><span class="cx"> - (void)didStartProvisionalLoadForFrame:(WKFrameRef)frame;
</span><span class="cx"> - (void)didCommitLoadForFrame:(WKFrameRef)frame;
</span><span class="cx"> - (void)didReceiveServerRedirectForProvisionalLoadForFrame:(WKFrameRef)frame;
</span><span class="lines">@@ -68,6 +65,7 @@
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> [progressIndicator unbind:NSHiddenBinding];
</span><ins>+ [progressIndicator unbind:NSValueBinding];
</ins><span class="cx">
</span><span class="cx"> WKRelease(_context);
</span><span class="cx"> WKRelease(_pageGroup);
</span><span class="lines">@@ -388,21 +386,6 @@
</span><span class="cx"> LOG(@"didDetectXSSForFrame");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void didStartProgress(WKPageRef page, const void *clientInfo)
-{
- [(WK2BrowserWindowController *)clientInfo didStartProgress];
-}
-
-static void didChangeProgress(WKPageRef page, const void *clientInfo)
-{
- [(WK2BrowserWindowController *)clientInfo didChangeProgress:WKPageGetEstimatedProgress(page)];
-}
-
-static void didFinishProgress(WKPageRef page, const void *clientInfo)
-{
- [(WK2BrowserWindowController *)clientInfo didFinishProgress];
-}
-
</del><span class="cx"> static void didBecomeUnresponsive(WKPageRef page, const void *clientInfo)
</span><span class="cx"> {
</span><span class="cx"> LOG(@"didBecomeUnresponsive");
</span><span class="lines">@@ -618,6 +601,7 @@
</span><span class="cx"> [containerView addSubview:_webView];
</span><span class="cx">
</span><span class="cx"> [progressIndicator bind:NSHiddenBinding toObject:_webView.browsingContextController withKeyPath:@"loading" options:@{ NSValueTransformerNameBindingOption : NSNegateBooleanTransformerName }];
</span><ins>+ [progressIndicator bind:NSValueBinding toObject:_webView.browsingContextController withKeyPath:@"estimatedProgress" options:nil];
</ins><span class="cx">
</span><span class="cx"> WKPageLoaderClientV3 loadClient = {
</span><span class="cx"> { 3, self },
</span><span class="lines">@@ -637,9 +621,9 @@
</span><span class="cx"> didRunInsecureContentForFrame,
</span><span class="cx"> 0, // canAuthenticateAgainstProtectionSpaceInFrame
</span><span class="cx"> 0, // didReceiveAuthenticationChallengeInFrame
</span><del>- didStartProgress,
- didChangeProgress,
- didFinishProgress,
</del><ins>+ 0, // didStartProgress,
+ 0, // didChangeProgress,
+ 0, // didFinishProgress,
</ins><span class="cx"> didBecomeUnresponsive,
</span><span class="cx"> didBecomeResponsive,
</span><span class="cx"> processDidExit,
</span><span class="lines">@@ -714,21 +698,6 @@
</span><span class="cx"> WKPageSetPageUIClient(_webView.pageRef, &uiClient.base);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)didStartProgress
-{
- [progressIndicator setDoubleValue:0.0];
-}
-
-- (void)didChangeProgress:(double)value
-{
- [progressIndicator setDoubleValue:value];
-}
-
-- (void)didFinishProgress
-{
- [progressIndicator setDoubleValue:1.0];
-}
-
</del><span class="cx"> - (void)updateTextFieldFromURL:(WKURLRef)URLRef
</span><span class="cx"> {
</span><span class="cx"> if (!URLRef)
</span></span></pre>
</div>
</div>
</body>
</html>