<!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>[164258] 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/164258">164258</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 16:44:31 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add history delegate to WKWebView
https://bugs.webkit.org/show_bug.cgi?id=128930
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h.
* UIProcess/API/Cocoa/WKProcessClass.mm:
(-[WKProcessClass initWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _historyDelegate]):
(-[WKWebView _setHistoryDelegate:]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/Cocoa/HistoryClient.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h.
* UIProcess/Cocoa/HistoryClient.mm: Added.
(WebKit::HistoryClient::HistoryClient):
(WebKit::HistoryClient::~HistoryClient):
(WebKit::HistoryClient::didNavigateWithNavigationData):
(WebKit::HistoryClient::didPerformClientRedirect):
(WebKit::HistoryClient::didPerformServerRedirect):
(WebKit::HistoryClient::didUpdateHistoryTitle):
(WebKit::HistoryClient::populateVisitedLinks):
(WebKit::HistoryClient::shouldTrackVisitedLinks):
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::navigationStates):
(WebKit::NavigationState::NavigationState):
(WebKit::NavigationState::~NavigationState):
(WebKit::NavigationState::fromWebPage):
(WebKit::NavigationState::historyDelegate):
(WebKit::NavigationState::setHistoryDelegate):
(WebKit::NavigationState::didNavigateWithNavigationData):
(WebKit::NavigationState::didPerformClientRedirect):
(WebKit::NavigationState::didPerformServerRedirect):
(WebKit::NavigationState::didUpdateHistoryTitle):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStateh">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.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="#trunkSourceWebKit2UIProcessAPICocoaWKHistoryDelegatePrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaHistoryClienth">trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaHistoryClientmm">trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164257 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-02-18 00:30:50 UTC (rev 164257)
+++ trunk/Source/WebKit2/ChangeLog        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-02-17 Anders Carlsson <andersca@apple.com>
+
+ Add history delegate to WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=128930
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h.
+ * UIProcess/API/Cocoa/WKProcessClass.mm:
+ (-[WKProcessClass initWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _historyDelegate]):
+ (-[WKWebView _setHistoryDelegate:]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/Cocoa/HistoryClient.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h.
+ * UIProcess/Cocoa/HistoryClient.mm: Added.
+ (WebKit::HistoryClient::HistoryClient):
+ (WebKit::HistoryClient::~HistoryClient):
+ (WebKit::HistoryClient::didNavigateWithNavigationData):
+ (WebKit::HistoryClient::didPerformClientRedirect):
+ (WebKit::HistoryClient::didPerformServerRedirect):
+ (WebKit::HistoryClient::didUpdateHistoryTitle):
+ (WebKit::HistoryClient::populateVisitedLinks):
+ (WebKit::HistoryClient::shouldTrackVisitedLinks):
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::navigationStates):
+ (WebKit::NavigationState::NavigationState):
+ (WebKit::NavigationState::~NavigationState):
+ (WebKit::NavigationState::fromWebPage):
+ (WebKit::NavigationState::historyDelegate):
+ (WebKit::NavigationState::setHistoryDelegate):
+ (WebKit::NavigationState::didNavigateWithNavigationData):
+ (WebKit::NavigationState::didPerformClientRedirect):
+ (WebKit::NavigationState::didPerformServerRedirect):
+ (WebKit::NavigationState::didUpdateHistoryTitle):
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-02-17 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WebKit2] Merge WebProcessMac and WebProcessIOS into WebProcessCocoa
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKHistoryDelegatePrivatehfromrev164257trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h (from rev 164257, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h) (0 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h         (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKHistoryDelegatePrivate.h        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -0,0 +1,44 @@
</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.
+ */
+
+#import <WebKit2/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+@class WKNavigationData;
+@class WKWebView;
+
+@protocol WKHistoryDelegatePrivate <NSObject>
+
+- (void)_webView:(WKWebView *)webView didNavigateWithNavigationData:(WKNavigationData *)navigationData;
+- (void)_webView:(WKWebView *)webView didPerformClientRedirectFromURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL;
+- (void)_webView:(WKWebView *)webView didPerformServerRedirectFromURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL;
+- (void)_webView:(WKWebView *)webView didUpdateHistoryTitle:(NSString *)title forURL:(NSURL *)URL;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm (164257 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm        2014-02-18 00:30:50 UTC (rev 164257)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "HistoryClient.h"
</ins><span class="cx"> #import "WKObject.h"
</span><span class="cx"> #import "WKProcessClassConfigurationPrivate.h"
</span><span class="cx"> #import "WebContext.h"
</span><span class="lines">@@ -65,6 +66,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> API::Object::constructInWrapper<WebKit::WebContext>(self, bundlePath);
</span><ins>+ _context->setHistoryClient(std::make_unique<WebKit::HistoryClient>());
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (164257 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2014-02-18 00:30:50 UTC (rev 164257)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "WKBackForwardListInternal.h"
</span><span class="cx"> #import "WKBackForwardListItemInternal.h"
</span><span class="cx"> #import "WKBrowsingContextHandleInternal.h"
</span><ins>+#import "WKHistoryDelegatePrivate.h"
</ins><span class="cx"> #import "WKNavigationDelegate.h"
</span><span class="cx"> #import "WKNavigationInternal.h"
</span><span class="cx"> #import "WKPreferencesInternal.h"
</span><span class="lines">@@ -461,6 +462,16 @@
</span><span class="cx"> return _observedRenderingProgressEvents;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (id <WKHistoryDelegatePrivate>)_historyDelegate
+{
+ return [_navigationState->historyDelegate().leakRef() autorelease];
+}
+
+- (void)_setHistoryDelegate:(id <WKHistoryDelegatePrivate>)historyDelegate
+{
+ _navigationState->setHistoryDelegate(historyDelegate);
+}
+
</ins><span class="cx"> static inline WebCore::LayoutMilestones layoutMilestones(_WKRenderingProgressEvents events)
</span><span class="cx"> {
</span><span class="cx"> WebCore::LayoutMilestones milestones = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (164257 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h        2014-02-18 00:30:50 UTC (rev 164257)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> @class WKBrowsingContextHandle;
</span><span class="cx"> @class WKRemoteObjectRegistry;
</span><ins>+@protocol WKHistoryDelegatePrivate;
</ins><span class="cx">
</span><span class="cx"> @interface WKWebView (WKPrivate)
</span><span class="cx">
</span><span class="lines">@@ -42,6 +43,8 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, setter=_setObservedRenderingProgressEvents:) _WKRenderingProgressEvents _observedRenderingProgressEvents;
</span><span class="cx">
</span><ins>+@property (nonatomic, weak, setter=_setHistoryDelegate:) id <WKHistoryDelegatePrivate> _historyDelegate;
+
</ins><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> @property (nonatomic, setter=_setMinimumLayoutSizeOverride:) CGSize _minimumLayoutSizeOverride;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaHistoryClienthfromrev164257trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.h (from rev 164257, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h) (0 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.h         (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.h        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -0,0 +1,56 @@
</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 HistoryClient_h
+#define HistoryClient_h
+
+#import "WKFoundation.h"
+
+#if WK_API_ENABLED
+
+#import "APIHistoryClient.h"
+
+namespace WebKit {
+
+class HistoryClient : public API::HistoryClient {
+public:
+ HistoryClient();
+ ~HistoryClient();
+
+private:
+ // API::HistoryClient
+ virtual void didNavigateWithNavigationData(WebContext*, WebPageProxy*, const WebNavigationDataStore&, WebFrameProxy*) override;
+ virtual void didPerformClientRedirect(WebContext*, WebPageProxy*, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy*) override;
+ virtual void didPerformServerRedirect(WebContext*, WebPageProxy*, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy*) override;
+ virtual void didUpdateHistoryTitle(WebContext*, WebPageProxy*, const WTF::String& title, const WTF::String& url, WebFrameProxy*) override;
+ virtual void populateVisitedLinks(WebContext*) override;
+ virtual bool shouldTrackVisitedLinks() const override;
+};
+
+} // namespace WebKit
+
+#endif // WK_API_ENABLED
+
+#endif // HistoryClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaHistoryClientmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.mm (0 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.mm         (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.mm        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -0,0 +1,84 @@
</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.
+ */
+
+#import "config.h"
+#import "HistoryClient.h"
+
+#if WK_API_ENABLED
+
+#import "NavigationState.h"
+#import "WKHistoryDelegatePrivate.h"
+#import "WebFrameProxy.h"
+
+namespace WebKit {
+
+HistoryClient::HistoryClient()
+{
+}
+
+HistoryClient::~HistoryClient()
+{
+}
+
+void HistoryClient::didNavigateWithNavigationData(WebContext*, WebPageProxy* webPageProxy, const WebNavigationDataStore& navigationDataStore, WebFrameProxy* webFrameProxy)
+{
+ auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
+
+ navigationState.didNavigateWithNavigationData(navigationDataStore);
+}
+
+void HistoryClient::didPerformClientRedirect(WebContext*, WebPageProxy* webPageProxy, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy* webFrameProxy)
+{
+ auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
+
+ navigationState.didPerformClientRedirect(sourceURL, destinationURL);
+}
+
+void HistoryClient::didPerformServerRedirect(WebContext*, WebPageProxy* webPageProxy, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy* webFrameProxy)
+{
+ auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
+
+ navigationState.didPerformServerRedirect(sourceURL, destinationURL);
+}
+
+void HistoryClient::didUpdateHistoryTitle(WebContext*, WebPageProxy* webPageProxy, const WTF::String& title, const WTF::String& url, WebFrameProxy* webFrameProxy)
+{
+ auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
+
+ navigationState.didUpdateHistoryTitle(title, url);
+}
+
+void HistoryClient::populateVisitedLinks(WebContext*)
+{
+}
+
+bool HistoryClient::shouldTrackVisitedLinks() const
+{
+ return false;
+}
+
+} // namespace webKit
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h (164257 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h        2014-02-18 00:30:50 UTC (rev 164257)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.h        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -39,23 +39,37 @@
</span><span class="cx">
</span><span class="cx"> @class WKNavigation;
</span><span class="cx"> @class WKWebView;
</span><ins>+@protocol WKHistoryDelegatePrivate;
</ins><span class="cx"> @protocol WKNavigationDelegate;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+struct WebNavigationDataStore;
+
</ins><span class="cx"> class NavigationState : private PageLoadState::Observer {
</span><span class="cx"> public:
</span><span class="cx"> explicit NavigationState(WKWebView *);
</span><span class="cx"> ~NavigationState();
</span><span class="cx">
</span><ins>+ static NavigationState& fromWebPage(WebPageProxy&);
+
</ins><span class="cx"> std::unique_ptr<API::PolicyClient> createPolicyClient();
</span><span class="cx"> std::unique_ptr<API::LoaderClient> createLoaderClient();
</span><span class="cx">
</span><span class="cx"> RetainPtr<id <WKNavigationDelegate> > navigationDelegate();
</span><span class="cx"> void setNavigationDelegate(id <WKNavigationDelegate>);
</span><span class="cx">
</span><ins>+ RetainPtr<id <WKHistoryDelegatePrivate> > historyDelegate();
+ void setHistoryDelegate(id <WKHistoryDelegatePrivate>);
+
</ins><span class="cx"> RetainPtr<WKNavigation> createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *);
</span><span class="cx">
</span><ins>+ // Called by the history client.
+ void didNavigateWithNavigationData(const WebKit::WebNavigationDataStore&);
+ void didPerformClientRedirect(const WTF::String& sourceURL, const WTF::String& destinationURL);
+ void didPerformServerRedirect(const WTF::String& sourceURL, const WTF::String& destinationURL);
+ void didUpdateHistoryTitle(const WTF::String& title, const WTF::String& url);
+
</ins><span class="cx"> private:
</span><span class="cx"> class PolicyClient : public API::PolicyClient {
</span><span class="cx"> public:
</span><span class="lines">@@ -125,6 +139,14 @@
</span><span class="cx"> } m_navigationDelegateMethods;
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, RetainPtr<WKNavigation>> m_navigations;
</span><ins>+
+ WeakObjCPtr<id <WKHistoryDelegatePrivate> > m_historyDelegate;
+ struct {
+ bool webViewDidNavigateWithNavigationData : 1;
+ bool webViewDidPerformClientRedirectFromURLToURL : 1;
+ bool webViewDidPerformServerRedirectFromURLToURL : 1;
+ bool webViewDidUpdateHistoryTitleForURL : 1;
+ } m_historyDelegateMethods;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (164257 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2014-02-18 00:30:50 UTC (rev 164257)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -28,37 +28,64 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "APINavigationData.h"
+#import "APIURL.h"
+#import "APIString.h"
</ins><span class="cx"> #import "NavigationActionData.h"
</span><span class="cx"> #import "PageLoadState.h"
</span><span class="cx"> #import "WKBackForwardListInternal.h"
</span><span class="cx"> #import "WKBackForwardListItemInternal.h"
</span><span class="cx"> #import "WKFrameInfoInternal.h"
</span><ins>+#import "WKHistoryDelegatePrivate.h"
</ins><span class="cx"> #import "WKNSURLAuthenticationChallenge.h"
</span><ins>+#import "WKNSURLExtras.h"
</ins><span class="cx"> #import "WKNSURLProtectionSpace.h"
</span><span class="cx"> #import "WKNavigationActionInternal.h"
</span><ins>+#import "WKNavigationDataInternal.h"
</ins><span class="cx"> #import "WKNavigationDelegatePrivate.h"
</span><span class="cx"> #import "WKNavigationInternal.h"
</span><span class="cx"> #import "WKNavigationResponseInternal.h"
</span><span class="cx"> #import "WKWebViewInternal.h"
</span><span class="cx"> #import "WebFrameProxy.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+static HashMap<WebPageProxy*, NavigationState*>& navigationStates()
+{
+ static NeverDestroyed<HashMap<WebPageProxy*, NavigationState*>> navigationStates;
+
+ return navigationStates;
+}
+
</ins><span class="cx"> NavigationState::NavigationState(WKWebView *webView)
</span><span class="cx"> : m_webView(webView)
</span><span class="cx"> , m_navigationDelegateMethods()
</span><ins>+ , m_historyDelegateMethods()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_webView->_page);
</span><ins>+ ASSERT(!navigationStates().contains(m_webView->_page.get()));
</ins><span class="cx">
</span><ins>+ navigationStates().add(m_webView->_page.get(), this);
</ins><span class="cx"> m_webView->_page->pageLoadState().addObserver(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NavigationState::~NavigationState()
</span><span class="cx"> {
</span><ins>+ ASSERT(navigationStates().get(m_webView->_page.get()) == this);
+
+ navigationStates().remove(m_webView->_page.get());
</ins><span class="cx"> m_webView->_page->pageLoadState().removeObserver(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NavigationState& NavigationState::fromWebPage(WebPageProxy& webPageProxy)
+{
+ ASSERT(navigationStates().contains(&webPageProxy));
+
+ return *navigationStates().get(&webPageProxy);
+}
+
</ins><span class="cx"> std::unique_ptr<API::LoaderClient> NavigationState::createLoaderClient()
</span><span class="cx"> {
</span><span class="cx"> return std::make_unique<LoaderClient>(*this);
</span><span class="lines">@@ -94,6 +121,21 @@
</span><span class="cx"> m_navigationDelegateMethods.webViewWebProcessDidCrash = [delegate respondsToSelector:@selector(_webViewWebProcessDidCrash:)];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RetainPtr<id <WKHistoryDelegatePrivate> > NavigationState::historyDelegate()
+{
+ return m_historyDelegate.get();
+}
+
+void NavigationState::setHistoryDelegate(id <WKHistoryDelegatePrivate> historyDelegate)
+{
+ m_historyDelegate = historyDelegate;
+
+ m_historyDelegateMethods.webViewDidNavigateWithNavigationData = [historyDelegate respondsToSelector:@selector(_webView:didNavigateWithNavigationData:)];
+ m_historyDelegateMethods.webViewDidPerformClientRedirectFromURLToURL = [historyDelegate respondsToSelector:@selector(_webView:didPerformClientRedirectFromURL:toURL:)];
+ m_historyDelegateMethods.webViewDidPerformServerRedirectFromURLToURL = [historyDelegate respondsToSelector:@selector(_webView:didPerformServerRedirectFromURL:toURL:)];
+ m_historyDelegateMethods.webViewDidUpdateHistoryTitleForURL = [historyDelegate respondsToSelector:@selector(_webView:didUpdateHistoryTitle:forURL:)];
+}
+
</ins><span class="cx"> RetainPtr<WKNavigation> NavigationState::createLoadRequestNavigation(uint64_t navigationID, NSURLRequest *request)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_navigations.contains(navigationID));
</span><span class="lines">@@ -107,6 +149,54 @@
</span><span class="cx"> return navigation;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NavigationState::didNavigateWithNavigationData(const WebKit::WebNavigationDataStore& navigationDataStore)
+{
+ if (!m_historyDelegateMethods.webViewDidNavigateWithNavigationData)
+ return;
+
+ auto historyDelegate = m_historyDelegate.get();
+ if (!historyDelegate)
+ return;
+
+ [historyDelegate _webView:m_webView didNavigateWithNavigationData:wrapper(*API::NavigationData::create(navigationDataStore))];
+}
+
+void NavigationState::didPerformClientRedirect(const WTF::String& sourceURL, const WTF::String& destinationURL)
+{
+ if (!m_historyDelegateMethods.webViewDidPerformClientRedirectFromURLToURL)
+ return;
+
+ auto historyDelegate = m_historyDelegate.get();
+ if (!historyDelegate)
+ return;
+
+ [historyDelegate _webView:m_webView didPerformClientRedirectFromURL:[NSURL _web_URLWithWTFString:sourceURL] toURL:[NSURL _web_URLWithWTFString:destinationURL]];
+}
+
+void NavigationState::didPerformServerRedirect(const WTF::String& sourceURL, const WTF::String& destinationURL)
+{
+ if (!m_historyDelegateMethods.webViewDidPerformServerRedirectFromURLToURL)
+ return;
+
+ auto historyDelegate = m_historyDelegate.get();
+ if (!historyDelegate)
+ return;
+
+ [historyDelegate _webView:m_webView didPerformServerRedirectFromURL:[NSURL _web_URLWithWTFString:sourceURL] toURL:[NSURL _web_URLWithWTFString:destinationURL]];
+}
+
+void NavigationState::didUpdateHistoryTitle(const WTF::String& title, const WTF::String& url)
+{
+ if (!m_historyDelegateMethods.webViewDidUpdateHistoryTitleForURL)
+ return;
+
+ auto historyDelegate = m_historyDelegate.get();
+ if (!historyDelegate)
+ return;
+
+ [historyDelegate _webView:m_webView didUpdateHistoryTitle:title forURL:[NSURL _web_URLWithWTFString:url]];
+}
+
</ins><span class="cx"> NavigationState::PolicyClient::PolicyClient(NavigationState& navigationState)
</span><span class="cx"> : m_navigationState(navigationState)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (164257 => 164258)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2014-02-18 00:30:50 UTC (rev 164257)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj        2014-02-18 00:44:31 UTC (rev 164258)
</span><span class="lines">@@ -164,6 +164,9 @@
</span><span class="cx">                 1A3EED0E161A535400AEB4F5 /* MessageReceiverMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3EED0C161A535300AEB4F5 /* MessageReceiverMap.cpp */; };
</span><span class="cx">                 1A3EED0F161A535400AEB4F5 /* MessageReceiverMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */; };
</span><span class="cx">                 1A3EED12161A53D600AEB4F5 /* MessageReceiver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */; };
</span><ins>+                1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                1A422F8E18B29C6400D8CD96 /* HistoryClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A422F8C18B29C6400D8CD96 /* HistoryClient.mm */; };
+                1A422F8F18B29C6400D8CD96 /* HistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A422F8D18B29C6400D8CD96 /* HistoryClient.h */; };
</ins><span class="cx">                 1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A433F0C113C53DD00FACDE9 /* WebErrors.h */; };
</span><span class="cx">                 1A43E829188F3CDC009E4D30 /* WKProcessClassConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A43E827188F3CDC009E4D30 /* WKProcessClassConfiguration.mm */; };
</span><span class="cx">                 1A43E82A188F3CDC009E4D30 /* WKProcessClassConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43E828188F3CDC009E4D30 /* WKProcessClassConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="lines">@@ -1828,6 +1831,9 @@
</span><span class="cx">                 1A3EED0C161A535300AEB4F5 /* MessageReceiverMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MessageReceiverMap.cpp; sourceTree = "<group>"; };
</span><span class="cx">                 1A3EED0D161A535300AEB4F5 /* MessageReceiverMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageReceiverMap.h; sourceTree = "<group>"; };
</span><span class="cx">                 1A3EED11161A53D600AEB4F5 /* MessageReceiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageReceiver.h; sourceTree = "<group>"; };
</span><ins>+                1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHistoryDelegatePrivate.h; sourceTree = "<group>"; };
+                1A422F8C18B29C6400D8CD96 /* HistoryClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HistoryClient.mm; sourceTree = "<group>"; };
+                1A422F8D18B29C6400D8CD96 /* HistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryClient.h; sourceTree = "<group>"; };
</ins><span class="cx">                 1A433F0C113C53DD00FACDE9 /* WebErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebErrors.h; sourceTree = "<group>"; };
</span><span class="cx">                 1A43E827188F3CDC009E4D30 /* WKProcessClassConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessClassConfiguration.mm; sourceTree = "<group>"; };
</span><span class="cx">                 1A43E828188F3CDC009E4D30 /* WKProcessClassConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassConfiguration.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4023,6 +4029,8 @@
</span><span class="cx">                 1ABC3DF21899E415004F0626 /* Cocoa */ = {
</span><span class="cx">                         isa = PBXGroup;
</span><span class="cx">                         children = (
</span><ins>+                                1A422F8D18B29C6400D8CD96 /* HistoryClient.h */,
+                                1A422F8C18B29C6400D8CD96 /* HistoryClient.mm */,
</ins><span class="cx">                                 1ABC3DF41899E437004F0626 /* NavigationState.h */,
</span><span class="cx">                                 1ABC3DF31899E437004F0626 /* NavigationState.mm */,
</span><span class="cx">                         );
</span><span class="lines">@@ -4357,6 +4365,7 @@
</span><span class="cx">                                 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */,
</span><span class="cx">                                 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */,
</span><span class="cx">                                 1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */,
</span><ins>+                                1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */,
</ins><span class="cx">                                 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */,
</span><span class="cx">                                 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */,
</span><span class="cx">                                 1A256E3618A1A788006FB922 /* WKNavigationAction.h */,
</span><span class="lines">@@ -6289,6 +6298,7 @@
</span><span class="cx">                                 37DFA7001810BB92001F4A9F /* WKFoundation.h in Headers */,
</span><span class="cx">                                 1ABC3DF11899C6B6004F0626 /* WKNavigationInternal.h in Headers */,
</span><span class="cx">                                 1F604BA81889FA7400EE0395 /* WKRenderingProgressEvents.h in Headers */,
</span><ins>+                                1A422F8F18B29C6400D8CD96 /* HistoryClient.h in Headers */,
</ins><span class="cx">                                 BCBAACEB145225E30053F82F /* WKProcessGroup.h in Headers */,
</span><span class="cx">                                 377EAD4817E2C77B002D193D /* WKUserContentInjectedFrames.h in Headers */,
</span><span class="cx">                                 BC8699B5116AADAA002A925B /* WKView.h in Headers */,
</span><span class="lines">@@ -6533,6 +6543,7 @@
</span><span class="cx">                                 1QQ417CB12C00CCA002BE67B /* TextCheckerCompletion.h in Headers */,
</span><span class="cx">                                 1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */,
</span><span class="cx">                                 1AAF263914687C39004A1E8A /* TiledCoreAnimationDrawingArea.h in Headers */,
</span><ins>+                                1A422F8B18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h in Headers */,
</ins><span class="cx">                                 370F34A71829CFF3009027C8 /* WKBrowsingContextHistoryDelegate.h in Headers */,
</span><span class="cx">                                 1AF05D8714688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.h in Headers */,
</span><span class="cx">                                 1A64245E12DE29A100CAAE2C /* UpdateInfo.h in Headers */,
</span><span class="lines">@@ -8032,6 +8043,7 @@
</span><span class="cx">                                 CD73BA53131B645B00EEDED2 /* WebFullScreenManager.cpp in Sources */,
</span><span class="cx">                                 755422BD18062BB20046F6A8 /* WKOriginDataManager.cpp in Sources */,
</span><span class="cx">                                 CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */,
</span><ins>+                                1A422F8E18B29C6400D8CD96 /* HistoryClient.mm in Sources */,
</ins><span class="cx">                                 1FB00AC8185F76460019142E /* WKWebProcessPlugInPageGroup.mm in Sources */,
</span><span class="cx">                                 CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */,
</span><span class="cx">                                 CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>