<!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>[160129] 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/160129">160129</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-04 14:51:37 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a loading property to WKBrowsingContextController
https://bugs.webkit.org/show_bug.cgi?id=125256
Reviewed by Dan Bernstein.
Source/WebKit2:
* UIProcess/API/Cocoa/WKBrowsingContextController.h:
Add loading property.
* UIProcess/API/Cocoa/WKBrowsingContextConteroller.mm:
Implement willChangeIsLoading and didChangeIsLoading and call the relevant KVO methods.
(-[WKBrowsingContextController isLoading]):
Call through to the PageLoadState.
* UIProcess/PageLoadState.cpp:
(WebKit::PageLoadState::reset):
Use setState.
(WebKit::PageLoadState::isLoading):
Call isLoadingState.
(WebKit::PageLoadState::didStartProvisionalLoad):
Use setState.
(WebKit::PageLoadState::didFailProvisionalLoad):
Use setState.
(WebKit::PageLoadState::didCommitLoad):
Use setState.
(WebKit::PageLoadState::didFinishLoad):
Use setState.
(WebKit::PageLoadState::didFailLoad):
Use setState.
(WebKit::PageLoadState::isLoadingState):
Helper function for determining whether a state is a loading state or not.
(WebKit::PageLoadState::setState):
If setting the state will cause "isLoading" to change, call out to the observers.
* UIProcess/PageLoadState.h:
Tools:
Bind the progress indicator visibility to the "loading" property.
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController dealloc]):
(-[WK2BrowserWindowController awakeFromNib]):
(-[WK2BrowserWindowController didStartProgress]):
(-[WK2BrowserWindowController didFinishProgress]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h</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="#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 (160128 => 160129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-04 22:42:46 UTC (rev 160128)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-04 22:51:37 UTC (rev 160129)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2013-12-04 Anders Carlsson <andersca@apple.com>
+
+ Add a loading property to WKBrowsingContextController
+ https://bugs.webkit.org/show_bug.cgi?id=125256
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKBrowsingContextController.h:
+ Add loading property.
+
+ * UIProcess/API/Cocoa/WKBrowsingContextConteroller.mm:
+ Implement willChangeIsLoading and didChangeIsLoading and call the relevant KVO methods.
+
+ (-[WKBrowsingContextController isLoading]):
+ Call through to the PageLoadState.
+
+ * UIProcess/PageLoadState.cpp:
+ (WebKit::PageLoadState::reset):
+ Use setState.
+
+ (WebKit::PageLoadState::isLoading):
+ Call isLoadingState.
+
+ (WebKit::PageLoadState::didStartProvisionalLoad):
+ Use setState.
+
+ (WebKit::PageLoadState::didFailProvisionalLoad):
+ Use setState.
+
+ (WebKit::PageLoadState::didCommitLoad):
+ Use setState.
+
+ (WebKit::PageLoadState::didFinishLoad):
+ Use setState.
+
+ (WebKit::PageLoadState::didFailLoad):
+ Use setState.
+
+ (WebKit::PageLoadState::isLoadingState):
+ Helper function for determining whether a state is a loading state or not.
+
+ (WebKit::PageLoadState::setState):
+ If setting the state will cause "isLoading" to change, call out to the observers.
+
+ * UIProcess/PageLoadState.h:
+
</ins><span class="cx"> 2013-12-04 Nick Diego Yamane <nick.yamane@openbossa.org>
</span><span class="cx">
</span><span class="cx"> [EFL][GTK][WK2] Remove unnecessary reinterpret_casts when setting API clients
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h (160128 => 160129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2013-12-04 22:42:46 UTC (rev 160128)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h 2013-12-04 22:51:37 UTC (rev 160129)
</span><span class="lines">@@ -106,6 +106,8 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark Active Load Introspection
</span><span class="cx">
</span><ins>+@property (readonly, getter=isLoading) BOOL loading;
+
</ins><span class="cx"> /* URL for the active load. This is the URL that should be shown in user interface. */
</span><span class="cx"> @property(readonly) NSURL *activeURL;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (160128 => 160129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-04 22:42:46 UTC (rev 160128)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-04 22:51:37 UTC (rev 160129)
</span><span class="lines">@@ -61,6 +61,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ virtual void willChangeIsLoading() OVERRIDE
+ {
+ [m_controller willChangeValueForKey:@"loading"];
+ }
+
+ virtual void didChangeIsLoading() OVERRIDE
+ {
+ [m_controller didChangeValueForKey:@"loading"];
+ }
+
</ins><span class="cx"> virtual void willChangeTitle() OVERRIDE
</span><span class="cx"> {
</span><span class="cx"> [m_controller willChangeValueForKey:@"title"];
</span><span class="lines">@@ -269,6 +279,11 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark Active Load Introspection
</span><span class="cx">
</span><ins>+- (BOOL)isLoading
+{
+ return _page->pageLoadState().isLoading();
+}
+
</ins><span class="cx"> - (NSURL *)activeURL
</span><span class="cx"> {
</span><span class="cx"> return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageLoadStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.cpp (160128 => 160129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-12-04 22:42:46 UTC (rev 160128)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-12-04 22:51:37 UTC (rev 160129)
</span><span class="lines">@@ -55,7 +55,8 @@
</span><span class="cx">
</span><span class="cx"> void PageLoadState::reset()
</span><span class="cx"> {
</span><del>- m_state = State::Finished;
</del><ins>+ setState(State::Finished);
+
</ins><span class="cx"> m_pendingAPIRequestURL = String();
</span><span class="cx"> m_provisionalURL = String();
</span><span class="cx"> m_url = String();
</span><span class="lines">@@ -68,6 +69,11 @@
</span><span class="cx"> callObserverCallback(&Observer::didChangeTitle);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PageLoadState::isLoading() const
+{
+ return isLoadingState(m_state);
+}
+
</ins><span class="cx"> String PageLoadState::activeURL() const
</span><span class="cx"> {
</span><span class="cx"> // If there is a currently pending URL, it is the active URL,
</span><span class="lines">@@ -111,7 +117,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_provisionalURL.isEmpty());
</span><span class="cx">
</span><del>- m_state = State::Provisional;
</del><ins>+ setState(State::Provisional);
+
</ins><span class="cx"> m_provisionalURL = url;
</span><span class="cx">
</span><span class="cx"> setUnreachableURL(unreachableURL);
</span><span class="lines">@@ -128,7 +135,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_state == State::Provisional);
</span><span class="cx">
</span><del>- m_state = State::Finished;
</del><ins>+ setState(State::Finished);
+
</ins><span class="cx"> m_provisionalURL = String();
</span><span class="cx"> m_unreachableURL = m_lastUnreachableURL;
</span><span class="cx"> }
</span><span class="lines">@@ -137,7 +145,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_state == State::Provisional);
</span><span class="cx">
</span><del>- m_state = State::Committed;
</del><ins>+ setState(State::Committed);
+
</ins><span class="cx"> m_url = m_provisionalURL;
</span><span class="cx"> m_provisionalURL = String();
</span><span class="cx">
</span><span class="lines">@@ -149,14 +158,14 @@
</span><span class="cx"> ASSERT(m_state == State::Committed);
</span><span class="cx"> ASSERT(m_provisionalURL.isEmpty());
</span><span class="cx">
</span><del>- m_state = State::Finished;
</del><ins>+ setState(State::Finished);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageLoadState::didFailLoad()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_provisionalURL.isEmpty());
</span><span class="cx">
</span><del>- m_state = State::Finished;
</del><ins>+ setState(State::Finished);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageLoadState::didSameDocumentNavigation(const String& url)
</span><span class="lines">@@ -184,6 +193,40 @@
</span><span class="cx"> callObserverCallback(&Observer::didChangeTitle);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PageLoadState::isLoadingState(State state)
+{
+ switch (state) {
+ case State::Provisional:
+ case State::Committed:
+ return true;
+
+ case State::Finished:
+ return false;
+ }
+
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
+void PageLoadState::setState(State state)
+{
+ if (m_state == state)
+ return;
+
+ bool isLoadingIsChanging = false;
+
+ if (isLoadingState(m_state) != isLoadingState(state))
+ isLoadingIsChanging = true;
+
+ if (isLoadingIsChanging)
+ callObserverCallback(&Observer::willChangeIsLoading);
+
+ m_state = state;
+
+ if (isLoadingIsChanging)
+ callObserverCallback(&Observer::didChangeIsLoading);
+}
+
</ins><span class="cx"> void PageLoadState::callObserverCallback(void (Observer::*callback)())
</span><span class="cx"> {
</span><span class="cx"> for (auto* observer : m_observers)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageLoadStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.h (160128 => 160129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageLoadState.h 2013-12-04 22:42:46 UTC (rev 160128)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.h 2013-12-04 22:51:37 UTC (rev 160129)
</span><span class="lines">@@ -45,6 +45,9 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~Observer() { }
</span><span class="cx">
</span><ins>+ virtual void willChangeIsLoading() = 0;
+ virtual void didChangeIsLoading() = 0;
+
</ins><span class="cx"> virtual void willChangeTitle() = 0;
</span><span class="cx"> virtual void didChangeTitle() = 0;
</span><span class="cx"> };
</span><span class="lines">@@ -54,6 +57,8 @@
</span><span class="cx">
</span><span class="cx"> void reset();
</span><span class="cx">
</span><ins>+ bool isLoading() const;
+
</ins><span class="cx"> const String& provisionalURL() const { return m_provisionalURL; }
</span><span class="cx"> const String& url() const { return m_url; }
</span><span class="cx"> const String& unreachableURL() const { return m_unreachableURL; }
</span><span class="lines">@@ -80,6 +85,9 @@
</span><span class="cx"> void setTitle(const String&);
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ static bool isLoadingState(State);
+ void setState(State);
+
</ins><span class="cx"> void callObserverCallback(void (Observer::*)());
</span><span class="cx">
</span><span class="cx"> Vector<Observer*> m_observers;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160128 => 160129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-04 22:42:46 UTC (rev 160128)
+++ trunk/Tools/ChangeLog 2013-12-04 22:51:37 UTC (rev 160129)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-12-04 Anders Carlsson <andersca@apple.com>
+
+ Add a loading property to WKBrowsingContextController
+ https://bugs.webkit.org/show_bug.cgi?id=125256
+
+ Reviewed by Dan Bernstein.
+
+ Bind the progress indicator visibility to the "loading" property.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController dealloc]):
+ (-[WK2BrowserWindowController awakeFromNib]):
+ (-[WK2BrowserWindowController didStartProgress]):
+ (-[WK2BrowserWindowController didFinishProgress]):
+
</ins><span class="cx"> 2013-12-04 Nick Diego Yamane <nick.yamane@openbossa.org>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Buildfix after r160104
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (160128 => 160129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-04 22:42:46 UTC (rev 160128)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-12-04 22:51:37 UTC (rev 160129)
</span><span class="lines">@@ -67,6 +67,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><ins>+ [progressIndicator unbind:NSHiddenBinding];
+
</ins><span class="cx"> WKRelease(_context);
</span><span class="cx"> WKRelease(_pageGroup);
</span><span class="cx"> _webView.browsingContextController.policyDelegate = nil;
</span><span class="lines">@@ -614,7 +616,9 @@
</span><span class="cx">
</span><span class="cx"> [_webView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
</span><span class="cx"> [containerView addSubview:_webView];
</span><del>-
</del><ins>+
+ [progressIndicator bind:NSHiddenBinding toObject:_webView.browsingContextController withKeyPath:@"loading" options:@{ NSValueTransformerNameBindingOption : NSNegateBooleanTransformerName }];
+
</ins><span class="cx"> WKPageLoaderClientV3 loadClient = {
</span><span class="cx"> { 3, self },
</span><span class="cx"> didStartProvisionalLoadForFrame,
</span><span class="lines">@@ -713,7 +717,6 @@
</span><span class="cx"> - (void)didStartProgress
</span><span class="cx"> {
</span><span class="cx"> [progressIndicator setDoubleValue:0.0];
</span><del>- [progressIndicator setHidden:NO];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didChangeProgress:(double)value
</span><span class="lines">@@ -723,7 +726,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)didFinishProgress
</span><span class="cx"> {
</span><del>- [progressIndicator setHidden:YES];
</del><span class="cx"> [progressIndicator setDoubleValue:1.0];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>