<!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>[190631] trunk/Source/WebKit2</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/190631">190631</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-06 12:11:24 -0700 (Tue, 06 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WKPage needs to expose a KVO-compliant object, similar to WKWebView
https://bugs.webkit.org/show_bug.cgi?id=149851
rdar://problem/22382022
Reviewed by Dan Bernstein.
Move the PageLoadStateObserver object from WKBrowsingContextController out into a separate file and make it
work with any Objective-C object. Use it in WKObservablePageState and add a WKPageCreateObservableState function.
* UIProcess/API/C/mac/WKPagePrivateMac.h:
* UIProcess/API/C/mac/WKPagePrivateMac.mm: Renamed from Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp.
(-[WKObservablePageState initWithPage:]):
(-[WKObservablePageState dealloc]):
(-[WKObservablePageState isLoading]):
(-[WKObservablePageState title]):
(-[WKObservablePageState URL]):
(-[WKObservablePageState hasOnlySecureContent]):
(-[WKObservablePageState estimatedProgress]):
(WKPageCreateObservableState):
(WKPageGetProcessIdentifier):
(WKPageIsURLKnownHSTSHost):
* UIProcess/API/Cocoa/PageLoadStateObserver.h: Added.
(WebKit::PageLoadStateObserver::PageLoadStateObserver):
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(PageLoadStateObserver::PageLoadStateObserver): Deleted.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaPageLoadStateObserverh">trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMaccpp">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190630 => 190631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-06 19:11:24 UTC (rev 190631)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-10-06 Anders Carlsson <andersca@apple.com>
+
+ WKPage needs to expose a KVO-compliant object, similar to WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=149851
+ rdar://problem/22382022
+
+ Reviewed by Dan Bernstein.
+
+ Move the PageLoadStateObserver object from WKBrowsingContextController out into a separate file and make it
+ work with any Objective-C object. Use it in WKObservablePageState and add a WKPageCreateObservableState function.
+
+ * UIProcess/API/C/mac/WKPagePrivateMac.h:
+ * UIProcess/API/C/mac/WKPagePrivateMac.mm: Renamed from Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp.
+ (-[WKObservablePageState initWithPage:]):
+ (-[WKObservablePageState dealloc]):
+ (-[WKObservablePageState isLoading]):
+ (-[WKObservablePageState title]):
+ (-[WKObservablePageState URL]):
+ (-[WKObservablePageState hasOnlySecureContent]):
+ (-[WKObservablePageState estimatedProgress]):
+ (WKPageCreateObservableState):
+ (WKPageGetProcessIdentifier):
+ (WKPageIsURLKnownHSTSHost):
+ * UIProcess/API/Cocoa/PageLoadStateObserver.h: Added.
+ (WebKit::PageLoadStateObserver::PageLoadStateObserver):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (PageLoadStateObserver::PageLoadStateObserver): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-10-06 Daniel Bates <dbates@webkit.org>
</span><span class="cx">
</span><span class="cx"> Enable XSLT when building WebKit for iOS using the public iOS SDK
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMaccpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp (190630 => 190631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp 2015-10-06 19:11:24 UTC (rev 190631)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 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.
- */
-
-#include "config.h"
-#include "WKPagePrivateMac.h"
-
-#include "WKAPICast.h"
-#include "WebPageGroup.h"
-#include "WebPageProxy.h"
-#include "WebPreferences.h"
-#include "WebProcessPool.h"
-
-using namespace WebKit;
-
-pid_t WKPageGetProcessIdentifier(WKPageRef pageRef)
-{
- return toImpl(pageRef)->processIdentifier();
-}
-
-bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url)
-{
- WebPageProxy* webPageProxy = toImpl(page);
- bool privateBrowsingEnabled = webPageProxy->pageGroup().preferences().privateBrowsingEnabled();
-
- return webPageProxy->process().processPool().isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h (190630 => 190631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2015-10-06 19:11:24 UTC (rev 190631)
</span><span class="lines">@@ -33,6 +33,22 @@
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifdef __OBJC__
+
+@protocol _WKObservablePageState
+
+@property (nonatomic, readonly, copy) NSString *title;
+@property (nonatomic, readonly, copy) NSURL *URL;
+@property (nonatomic, readonly, getter=isLoading) BOOL loading;
+@property (nonatomic, readonly) double estimatedProgress;
+@property (nonatomic, readonly) BOOL hasOnlySecureContent;
+
+@end
+
+WK_EXPORT id <_WKObservablePageState> WKPageCreateObservableState(WKPageRef page) NS_RETURNS_RETAINED;
+
+#endif
+
</ins><span class="cx"> WK_EXPORT pid_t WKPageGetProcessIdentifier(WKPageRef page);
</span><span class="cx"> WK_EXPORT bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmmfromrev190620trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMaccpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (from rev 190620, trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp) (0 => 190631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-10-06 19:11:24 UTC (rev 190631)
</span><span class="lines">@@ -0,0 +1,109 @@
</span><ins>+/*
+ * Copyright (C) 2011 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.
+ */
+
+#import "config.h"
+#import "WKPagePrivateMac.h"
+
+#import "PageLoadStateObserver.h"
+#import "WKAPICast.h"
+#import "WKNSURLExtras.h"
+#import "WebPageGroup.h"
+#import "WebPageProxy.h"
+#import "WebPreferences.h"
+#import "WebProcessPool.h"
+
+using namespace WebKit;
+
+@interface WKObservablePageState : NSObject <_WKObservablePageState>
+@end
+
+@implementation WKObservablePageState {
+ RefPtr<WebPageProxy> _page;
+ std::unique_ptr<PageLoadStateObserver> _observer;
+};
+
+- (id)initWithPage:(RefPtr<WebPageProxy>&&)page
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _page = WTF::move(page);
+ _observer = std::make_unique<PageLoadStateObserver>(self, @"URL");
+ _page->pageLoadState().addObserver(*_observer);
+
+ return self;
+}
+
+- (void)dealloc
+{
+ _page->pageLoadState().removeObserver(*_observer);
+
+ [super dealloc];
+}
+
+- (BOOL)isLoading
+{
+ return _page->pageLoadState().isLoading();
+}
+
+- (NSString *)title
+{
+ return _page->pageLoadState().title();
+}
+
+- (NSURL *)URL
+{
+ return [NSURL _web_URLWithWTFString:_page->pageLoadState().activeURL()];
+}
+
+- (BOOL)hasOnlySecureContent
+{
+ return _page->pageLoadState().hasOnlySecureContent();
+}
+
+- (double)estimatedProgress
+{
+ return _page->estimatedProgress();
+}
+
+@end
+
+id <_WKObservablePageState> WKPageCreateObservableState(WKPageRef pageRef)
+{
+ return [[WKObservablePageState alloc] initWithPage:toImpl(pageRef)];
+}
+
+pid_t WKPageGetProcessIdentifier(WKPageRef pageRef)
+{
+ return toImpl(pageRef)->processIdentifier();
+}
+
+bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url)
+{
+ WebPageProxy* webPageProxy = toImpl(page);
+ bool privateBrowsingEnabled = webPageProxy->pageGroup().preferences().privateBrowsingEnabled();
+
+ return webPageProxy->process().processPool().isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled);
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaPageLoadStateObserverh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h (0 => 190631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/PageLoadStateObserver.h 2015-10-06 19:11:24 UTC (rev 190631)
</span><span class="lines">@@ -0,0 +1,107 @@
</span><ins>+/*
+ * Copyright (C) 2015 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 PageLoadStateObserver_h
+#define PageLoadStateObserver_h
+
+#import "PageLoadState.h"
+
+namespace WebKit {
+
+class PageLoadStateObserver : public PageLoadState::Observer {
+public:
+ PageLoadStateObserver(id object, NSString *activeURLKey = @"activeURL")
+ : m_object(object)
+ , m_activeURLKey(adoptNS([activeURLKey copy]))
+ {
+ }
+
+private:
+ virtual void willChangeIsLoading() override
+ {
+ [m_object willChangeValueForKey:@"loading"];
+ }
+
+ virtual void didChangeIsLoading() override
+ {
+ [m_object didChangeValueForKey:@"loading"];
+ }
+
+ virtual void willChangeTitle() override
+ {
+ [m_object willChangeValueForKey:@"title"];
+ }
+
+ virtual void didChangeTitle() override
+ {
+ [m_object didChangeValueForKey:@"title"];
+ }
+
+ virtual void willChangeActiveURL() override
+ {
+ [m_object willChangeValueForKey:m_activeURLKey.get()];
+ }
+
+ virtual void didChangeActiveURL() override
+ {
+ [m_object didChangeValueForKey:m_activeURLKey.get()];
+ }
+
+ virtual void willChangeHasOnlySecureContent() override
+ {
+ [m_object willChangeValueForKey:@"hasOnlySecureContent"];
+ }
+
+ virtual void didChangeHasOnlySecureContent() override
+ {
+ [m_object didChangeValueForKey:@"hasOnlySecureContent"];
+ }
+
+ virtual void willChangeEstimatedProgress() override
+ {
+ [m_object willChangeValueForKey:@"estimatedProgress"];
+ }
+
+ virtual void didChangeEstimatedProgress() override
+ {
+ [m_object didChangeValueForKey:@"estimatedProgress"];
+ }
+
+ virtual void willChangeCanGoBack() override { }
+ virtual void didChangeCanGoBack() override { }
+ virtual void willChangeCanGoForward() override { }
+ virtual void didChangeCanGoForward() override { }
+ virtual void willChangeNetworkRequestsInProgress() override { }
+ virtual void didChangeNetworkRequestsInProgress() override { }
+ virtual void willChangeCertificateInfo() override { }
+ virtual void didChangeCertificateInfo() override { }
+
+ id m_object;
+ RetainPtr<NSString> m_activeURLKey;
+};
+
+}
+
+#endif // PageLoadStateObserver_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (190630 => 190631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-10-06 19:11:24 UTC (rev 190631)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "APIData.h"
</span><span class="cx"> #import "ObjCObjectGraph.h"
</span><ins>+#import "PageLoadStateObserver.h"
</ins><span class="cx"> #import "RemoteObjectRegistry.h"
</span><span class="cx"> #import "RemoteObjectRegistryMessages.h"
</span><span class="cx"> #import "WKBackForwardListInternal.h"
</span><span class="lines">@@ -61,76 +62,6 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-class PageLoadStateObserver : public PageLoadState::Observer {
-public:
- PageLoadStateObserver(WKBrowsingContextController *controller)
- : m_controller(controller)
- {
- }
-
-private:
- virtual void willChangeIsLoading() override
- {
- [m_controller willChangeValueForKey:@"loading"];
- }
-
- virtual void didChangeIsLoading() override
- {
- [m_controller didChangeValueForKey:@"loading"];
- }
-
- virtual void willChangeTitle() override
- {
- [m_controller willChangeValueForKey:@"title"];
- }
-
- virtual void didChangeTitle() override
- {
- [m_controller didChangeValueForKey:@"title"];
- }
-
- virtual void willChangeActiveURL() override
- {
- [m_controller willChangeValueForKey:@"activeURL"];
- }
-
- virtual void didChangeActiveURL() override
- {
- [m_controller didChangeValueForKey:@"activeURL"];
- }
-
- virtual void willChangeHasOnlySecureContent() override
- {
- [m_controller willChangeValueForKey:@"hasOnlySecureContent"];
- }
-
- virtual void didChangeHasOnlySecureContent() override
- {
- [m_controller didChangeValueForKey:@"hasOnlySecureContent"];
- }
-
- virtual void willChangeEstimatedProgress() override
- {
- [m_controller willChangeValueForKey:@"estimatedProgress"];
- }
-
- virtual void didChangeEstimatedProgress() override
- {
- [m_controller didChangeValueForKey:@"estimatedProgress"];
- }
-
- virtual void willChangeCanGoBack() override { }
- virtual void didChangeCanGoBack() override { }
- virtual void willChangeCanGoForward() override { }
- virtual void didChangeCanGoForward() override { }
- virtual void willChangeNetworkRequestsInProgress() override { }
- virtual void didChangeNetworkRequestsInProgress() override { }
- virtual void willChangeCertificateInfo() override { }
- virtual void didChangeCertificateInfo() override { }
-
- WKBrowsingContextController *m_controller;
-};
-
</del><span class="cx"> NSString * const WKActionIsMainFrameKey = @"WKActionIsMainFrameKey";
</span><span class="cx"> NSString * const WKActionNavigationTypeKey = @"WKActionNavigationTypeKey";
</span><span class="cx"> NSString * const WKActionMouseButtonKey = @"WKActionMouseButtonKey";
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (190630 => 190631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-06 18:45:04 UTC (rev 190630)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-10-06 19:11:24 UTC (rev 190631)
</span><span class="lines">@@ -314,6 +314,7 @@
</span><span class="cx"> 1A81B38018BD66AD0007FDAC /* _WKVisitedLinkStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */; };
</span><span class="cx"> 1A81B38118BD66AD0007FDAC /* _WKVisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A81B38518BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */; };
</span><ins>+ 1A8B66B01BC43C860082DF77 /* PageLoadStateObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */; settings = {ASSET_TAGS = (); }; };
</ins><span class="cx"> 1A8C728C1738477C000A6554 /* LocalStorageDatabaseTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C728A1738477C000A6554 /* LocalStorageDatabaseTracker.cpp */; };
</span><span class="cx"> 1A8C728D1738477C000A6554 /* LocalStorageDatabaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8C728B1738477C000A6554 /* LocalStorageDatabaseTracker.h */; };
</span><span class="cx"> 1A8E7D3C18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8E7D3A18C15149005A702A /* VisitedLinkTableControllerMessageReceiver.cpp */; };
</span><span class="lines">@@ -1578,7 +1579,7 @@
</span><span class="cx"> BCE0937714FB128C001138D9 /* LayerHostingContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE0937514FB128B001138D9 /* LayerHostingContext.mm */; };
</span><span class="cx"> BCE0937814FB128C001138D9 /* LayerHostingContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE0937614FB128B001138D9 /* LayerHostingContext.h */; };
</span><span class="cx"> BCE0E425168B7A280057E66A /* WebProcessSupplement.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE0E424168B7A280057E66A /* WebProcessSupplement.h */; };
</span><del>- BCE17B7D1381F1170012A641 /* WKPagePrivateMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE17B7B1381F1170012A641 /* WKPagePrivateMac.cpp */; };
</del><ins>+ BCE17B7D1381F1170012A641 /* WKPagePrivateMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE17B7B1381F1170012A641 /* WKPagePrivateMac.mm */; };
</ins><span class="cx"> BCE17B7E1381F1170012A641 /* WKPagePrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCE2315D122C30CA00D5C35A /* APIURLRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE2315B122C30CA00D5C35A /* APIURLRequest.h */; };
</span><span class="cx"> BCE2315E122C30CA00D5C35A /* APIURLRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE2315C122C30CA00D5C35A /* APIURLRequest.cpp */; };
</span><span class="lines">@@ -2419,6 +2420,7 @@
</span><span class="cx"> 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKVisitedLinkStore.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkStore.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A81B38418BD673A0007FDAC /* _WKVisitedLinkStoreInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkStoreInternal.h; sourceTree = "<group>"; };
</span><ins>+ 1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageLoadStateObserver.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A8C728A1738477C000A6554 /* LocalStorageDatabaseTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalStorageDatabaseTracker.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A8C728B1738477C000A6554 /* LocalStorageDatabaseTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalStorageDatabaseTracker.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A8E7D3818C150BF005A702A /* VisitedLinkTableController.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = VisitedLinkTableController.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -3802,7 +3804,7 @@
</span><span class="cx"> BCE0937514FB128B001138D9 /* LayerHostingContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LayerHostingContext.mm; sourceTree = "<group>"; };
</span><span class="cx"> BCE0937614FB128B001138D9 /* LayerHostingContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerHostingContext.h; sourceTree = "<group>"; };
</span><span class="cx"> BCE0E424168B7A280057E66A /* WebProcessSupplement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessSupplement.h; sourceTree = "<group>"; };
</span><del>- BCE17B7B1381F1170012A641 /* WKPagePrivateMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WKPagePrivateMac.cpp; path = mac/WKPagePrivateMac.cpp; sourceTree = "<group>"; };
</del><ins>+ BCE17B7B1381F1170012A641 /* WKPagePrivateMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WKPagePrivateMac.mm; path = mac/WKPagePrivateMac.mm; sourceTree = "<group>"; };
</ins><span class="cx"> BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKPagePrivateMac.h; path = mac/WKPagePrivateMac.h; sourceTree = "<group>"; };
</span><span class="cx"> BCE2315B122C30CA00D5C35A /* APIURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIURLRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> BCE2315C122C30CA00D5C35A /* APIURLRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIURLRequest.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4398,6 +4400,7 @@
</span><span class="cx"> 1AFB4C701ADF155D00B33339 /* _WKWebsiteDataStore.h */,
</span><span class="cx"> 1AFB4C6F1ADF155D00B33339 /* _WKWebsiteDataStore.mm */,
</span><span class="cx"> 1A4A93B61AEB08EA00150E9C /* _WKWebsiteDataStoreInternal.h */,
</span><ins>+ 1A8B66AE1BC43C860082DF77 /* PageLoadStateObserver.h */,
</ins><span class="cx"> BC59548815C7868500FD1E3E /* WebKit2.h */,
</span><span class="cx"> BCBAAC6C144E61910053F82F /* WKBrowsingContextController.h */,
</span><span class="cx"> BCBAAC6D144E61920053F82F /* WKBrowsingContextController.mm */,
</span><span class="lines">@@ -5825,7 +5828,7 @@
</span><span class="cx"> 9FB5F393169E6A80002C25BF /* WKContextPrivateMac.h */,
</span><span class="cx"> 9FB5F392169E6A80002C25BF /* WKContextPrivateMac.mm */,
</span><span class="cx"> 6EE849C61368D92D0038D481 /* WKInspectorPrivateMac.h */,
</span><del>- BCE17B7B1381F1170012A641 /* WKPagePrivateMac.cpp */,
</del><ins>+ BCE17B7B1381F1170012A641 /* WKPagePrivateMac.mm */,
</ins><span class="cx"> BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */,
</span><span class="cx"> );
</span><span class="cx"> name = mac;
</span><span class="lines">@@ -8275,6 +8278,7 @@
</span><span class="cx"> BCBAACEB145225E30053F82F /* WKProcessGroup.h in Headers */,
</span><span class="cx"> BCBAACED145225E30053F82F /* WKProcessGroupPrivate.h in Headers */,
</span><span class="cx"> 1A15841A189044F50017616C /* WKProcessPool.h in Headers */,
</span><ins>+ 1A8B66B01BC43C860082DF77 /* PageLoadStateObserver.h in Headers */,
</ins><span class="cx"> 1A3CC16918907EB0001E6ED8 /* WKProcessPoolInternal.h in Headers */,
</span><span class="cx"> 1A6509CE18B4146200614332 /* WKProcessPoolPrivate.h in Headers */,
</span><span class="cx"> 512F58FC12A88A5400629530 /* WKProtectionSpace.h in Headers */,
</span><span class="lines">@@ -10042,7 +10046,7 @@
</span><span class="cx"> BCD597D6112B56DC00EC8C23 /* WKPage.cpp in Sources */,
</span><span class="cx"> 7C89D29B1A67837B003A5FDE /* WKPageConfigurationRef.cpp in Sources */,
</span><span class="cx"> BC7B633812A45ABA00D174A4 /* WKPageGroup.cpp in Sources */,
</span><del>- BCE17B7D1381F1170012A641 /* WKPagePrivateMac.cpp in Sources */,
</del><ins>+ BCE17B7D1381F1170012A641 /* WKPagePrivateMac.mm in Sources */,
</ins><span class="cx"> 2D6AB542192B1C4A003A9FD1 /* WKPDFPageNumberIndicator.mm in Sources */,
</span><span class="cx"> 2DA1E4FF18C02B6A00DBC929 /* WKPDFView.mm in Sources */,
</span><span class="cx"> 7C135AA8173B0BCA00586AE2 /* WKPluginInformation.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>