<!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>[179328] 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/179328">179328</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-01-28 19:05:12 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add API::{FrameInfo, NavigationAction, NavigationResponse} types
https://bugs.webkit.org/show_bug.cgi?id=140982
Reviewed by Sam Weinig.
Make C++ API objects for WK{FrameInfo, NavigationAction, NavigationResponse}
to wrap around, as a step towards moving Modern API logic down into WebPageProxy.
* Shared/API/APIObject.h:
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
* UIProcess/API/APIFrameInfo.cpp: Added.
* UIProcess/API/APIFrameInfo.h: Added.
* UIProcess/API/APINavigationAction.h: Added.
* UIProcess/API/APINavigationResponse.h: Added.
Add API::FrameInfo, API::NavigationAction, and API::NavigationResponse.
* UIProcess/API/Cocoa/WKFrameInfo.mm:
* UIProcess/API/Cocoa/WKFrameInfoInternal.h:
Make WKFrameInfo a WKObject, wrapping a API::FrameInfo.
* UIProcess/API/Cocoa/WKNavigationAction.mm:
* UIProcess/API/Cocoa/WKNavigationActionInternal.h:
Make WKNavigationAction a WKObject, wrapping a API::NavigationAction.
* UIProcess/API/Cocoa/WKNavigationResponse.mm:
* UIProcess/API/Cocoa/WKNavigationResponseInternal.h:
Make WKNavigationResponse a WKObject, wrapping a API::NavigationResponse.
* UIProcess/API/Cocoa/WKUserContentController.mm:
Adopt API::FrameInfo.
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
Adopt API::FrameInfo, and reorganize the code slightly.
Adopt API::NavigationAction.
(WebKit::NavigationState::PolicyClient::decidePolicyForResponse):
Adopt API::FrameInfo.
Adopt API::NavigationResponse.
(WebKit::NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame):
Adopt API::FrameInfo.
* UIProcess/Cocoa/UIDelegate.mm:
(WebKit::UIDelegate::UIClient::createNewPage):
(WebKit::UIDelegate::UIClient::runJavaScriptAlert):
(WebKit::UIDelegate::UIClient::runJavaScriptConfirm):
(WebKit::UIDelegate::UIClient::runJavaScriptPrompt):
Adopt API::FrameInfo.
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaAPIObjectmm">trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKFrameInfomm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKFrameInfoInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationResponsemm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationResponseInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponseInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegatemm">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.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="#trunkSourceWebKit2UIProcessAPIAPIFrameInfocpp">trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIFrameInfoh">trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPINavigationActionh">trunk/Source/WebKit2/UIProcess/API/APINavigationAction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPINavigationResponseh">trunk/Source/WebKit2/UIProcess/API/APINavigationResponse.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2015-01-28 Tim Horton <timothy_horton@apple.com>
+
+ Add API::{FrameInfo, NavigationAction, NavigationResponse} types
+ https://bugs.webkit.org/show_bug.cgi?id=140982
+
+ Reviewed by Sam Weinig.
+
+ Make C++ API objects for WK{FrameInfo, NavigationAction, NavigationResponse}
+ to wrap around, as a step towards moving Modern API logic down into WebPageProxy.
+
+ * Shared/API/APIObject.h:
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ * UIProcess/API/APIFrameInfo.cpp: Added.
+ * UIProcess/API/APIFrameInfo.h: Added.
+ * UIProcess/API/APINavigationAction.h: Added.
+ * UIProcess/API/APINavigationResponse.h: Added.
+ Add API::FrameInfo, API::NavigationAction, and API::NavigationResponse.
+
+ * UIProcess/API/Cocoa/WKFrameInfo.mm:
+ * UIProcess/API/Cocoa/WKFrameInfoInternal.h:
+ Make WKFrameInfo a WKObject, wrapping a API::FrameInfo.
+
+ * UIProcess/API/Cocoa/WKNavigationAction.mm:
+ * UIProcess/API/Cocoa/WKNavigationActionInternal.h:
+ Make WKNavigationAction a WKObject, wrapping a API::NavigationAction.
+
+ * UIProcess/API/Cocoa/WKNavigationResponse.mm:
+ * UIProcess/API/Cocoa/WKNavigationResponseInternal.h:
+ Make WKNavigationResponse a WKObject, wrapping a API::NavigationResponse.
+
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ Adopt API::FrameInfo.
+
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
+ Adopt API::FrameInfo, and reorganize the code slightly.
+ Adopt API::NavigationAction.
+
+ (WebKit::NavigationState::PolicyClient::decidePolicyForResponse):
+ Adopt API::FrameInfo.
+ Adopt API::NavigationResponse.
+
+ (WebKit::NavigationState::LoaderClient::didFailProvisionalLoadWithErrorForFrame):
+ Adopt API::FrameInfo.
+
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::UIClient::createNewPage):
+ (WebKit::UIDelegate::UIClient::runJavaScriptAlert):
+ (WebKit::UIDelegate::UIClient::runJavaScriptConfirm):
+ (WebKit::UIDelegate::UIClient::runJavaScriptPrompt):
+ Adopt API::FrameInfo.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-01-28 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> http/tests/xmlhttprequest/workers/methods.html sometimes times out with disk cache enabled
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> Download,
</span><span class="cx"> FormSubmissionListener,
</span><span class="cx"> Frame,
</span><ins>+ FrameInfo,
</ins><span class="cx"> FramePolicyListener,
</span><span class="cx"> FullScreenManager,
</span><span class="cx"> GeolocationManager,
</span><span class="lines">@@ -121,7 +122,9 @@
</span><span class="cx"> KeyValueStorageManager,
</span><span class="cx"> MediaCacheManager,
</span><span class="cx"> Navigation,
</span><ins>+ NavigationAction,
</ins><span class="cx"> NavigationData,
</span><ins>+ NavigationResponse,
</ins><span class="cx"> Notification,
</span><span class="cx"> NotificationManager,
</span><span class="cx"> NotificationPermissionRequest,
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WKBrowsingContextGroupInternal.h"
</span><span class="cx"> #import "WKConnectionInternal.h"
</span><ins>+#import "WKFrameInfoInternal.h"
</ins><span class="cx"> #import "WKNSArray.h"
</span><span class="cx"> #import "WKNSData.h"
</span><span class="cx"> #import "WKNSDictionary.h"
</span><span class="lines">@@ -41,8 +42,10 @@
</span><span class="cx"> #import "WKNSURL.h"
</span><span class="cx"> #import "WKNSURLAuthenticationChallenge.h"
</span><span class="cx"> #import "WKNSURLRequest.h"
</span><ins>+#import "WKNavigationActionInternal.h"
</ins><span class="cx"> #import "WKNavigationDataInternal.h"
</span><span class="cx"> #import "WKNavigationInternal.h"
</span><ins>+#import "WKNavigationResponseInternal.h"
</ins><span class="cx"> #import "WKPreferencesInternal.h"
</span><span class="cx"> #import "WKProcessPoolInternal.h"
</span><span class="cx"> #import "WKUserContentControllerInternal.h"
</span><span class="lines">@@ -142,14 +145,26 @@
</span><span class="cx"> wrapper = [_WKFrameHandle alloc];
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::FrameInfo:
+ wrapper = [WKFrameInfo alloc];
+ break;
+
</ins><span class="cx"> case Type::Navigation:
</span><span class="cx"> wrapper = [WKNavigation alloc];
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::NavigationAction:
+ wrapper = [WKNavigationAction alloc];
+ break;
+
</ins><span class="cx"> case Type::NavigationData:
</span><span class="cx"> wrapper = [WKNavigationData alloc];
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::NavigationResponse:
+ wrapper = [WKNavigationResponse alloc];
+ break;
+
</ins><span class="cx"> case Type::PageGroup:
</span><span class="cx"> wrapper = [WKBrowsingContextGroup alloc];
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIFrameInfocpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp (0 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.cpp 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -0,0 +1,40 @@
</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.
+ */
+
+#include "config.h"
+#include "APIFrameInfo.h"
+
+#include "WebFrameProxy.h"
+
+namespace API {
+
+// FIXME: This should use the full request of the frame, not just the URL.
+FrameInfo::FrameInfo(const WebKit::WebFrameProxy& frame)
+ : m_isMainFrame(frame.isMainFrame())
+ , m_request(WebCore::ResourceRequest(frame.url()))
+{
+}
+
+} // namespace API
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIFrameInfoh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h (0 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIFrameInfo.h 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -0,0 +1,57 @@
</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 APIFrameInfo_h
+#define APIFrameInfo_h
+
+#include "APIObject.h"
+#include <WebCore/ResourceRequest.h>
+
+namespace WebKit {
+class WebFrameProxy;
+}
+
+namespace API {
+
+class FrameInfo final : public ObjectImpl<Object::Type::FrameInfo> {
+public:
+ static Ref<FrameInfo> create(const WebKit::WebFrameProxy& frame)
+ {
+ return adoptRef(*new FrameInfo(frame));
+ }
+
+ explicit FrameInfo(const WebKit::WebFrameProxy&);
+
+ bool isMainFrame() const { return m_isMainFrame; }
+ const WebCore::ResourceRequest& request() const { return m_request; }
+
+private:
+ bool m_isMainFrame;
+ WebCore::ResourceRequest m_request;
+};
+
+} // namespace API
+
+#endif // APIFrameInfo_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPINavigationActionh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APINavigationAction.h (0 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APINavigationAction.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APINavigationAction.h 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -0,0 +1,78 @@
</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 APINavigationAction_h
+#define APINavigationAction_h
+
+#include "APIObject.h"
+#include "NavigationActionData.h"
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/URL.h>
+
+namespace API {
+
+class FrameInfo;
+
+class NavigationAction final : public ObjectImpl<Object::Type::NavigationAction> {
+public:
+ static Ref<NavigationAction> create(const WebKit::NavigationActionData& navigationActionData, API::FrameInfo* sourceFrame, API::FrameInfo* targetFrame, const WebCore::ResourceRequest& request, const WebCore::URL& originalURL)
+ {
+ return adoptRef(*new NavigationAction(navigationActionData, sourceFrame, targetFrame, request, originalURL));
+ }
+
+ NavigationAction(const WebKit::NavigationActionData& navigationActionData, API::FrameInfo* sourceFrame, API::FrameInfo* targetFrame, const WebCore::ResourceRequest& request, const WebCore::URL& originalURL)
+ : m_sourceFrame(sourceFrame)
+ , m_targetFrame(targetFrame)
+ , m_request(request)
+ , m_originalURL(originalURL)
+ , m_navigationActionData(navigationActionData)
+ {
+ }
+
+ FrameInfo* sourceFrame() const { return m_sourceFrame.get(); }
+ FrameInfo* targetFrame() const { return m_targetFrame.get(); }
+
+ const WebCore::ResourceRequest& request() const { return m_request; }
+ const WebCore::URL& originalURL() const { return m_originalURL; }
+
+ WebCore::NavigationType navigationType() const { return m_navigationActionData.navigationType; }
+ WebKit::WebEvent::Modifiers modifiers() const { return m_navigationActionData.modifiers; }
+ WebKit::WebMouseEvent::Button mouseButton() const { return m_navigationActionData.mouseButton; }
+ bool isProcessingUserGesture() const { return m_navigationActionData.isProcessingUserGesture; }
+ bool canHandleRequest() const { return m_navigationActionData.canHandleRequest; }
+
+private:
+ RefPtr<FrameInfo> m_sourceFrame;
+ RefPtr<FrameInfo> m_targetFrame;
+
+ WebCore::ResourceRequest m_request;
+ WebCore::URL m_originalURL;
+
+ WebKit::NavigationActionData m_navigationActionData;
+};
+
+} // namespace API
+
+#endif // APINavigationAction_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPINavigationResponseh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APINavigationResponse.h (0 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APINavigationResponse.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APINavigationResponse.h 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -0,0 +1,69 @@
</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 APINavigationResponse_h
+#define APINavigationResponse_h
+
+#include "APIObject.h"
+#include <WebCore/ResourceRequest.h>
+#include <WebCore/ResourceResponse.h>
+
+namespace API {
+
+class FrameInfo;
+
+class NavigationResponse final : public ObjectImpl<Object::Type::NavigationResponse> {
+public:
+ static Ref<NavigationResponse> create(API::FrameInfo& frame, const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, bool canShowMIMEType)
+ {
+ return adoptRef(*new NavigationResponse(frame, request, response, canShowMIMEType));
+ }
+
+ NavigationResponse(API::FrameInfo& frame, const WebCore::ResourceRequest& request, const WebCore::ResourceResponse& response, bool canShowMIMEType)
+ : m_frame(frame)
+ , m_request(request)
+ , m_response(response)
+ , m_canShowMIMEType(canShowMIMEType)
+ {
+ }
+
+ FrameInfo& frame() { return m_frame.get(); }
+
+ const WebCore::ResourceRequest& request() const { return m_request; }
+ const WebCore::ResourceResponse& response() const { return m_response; }
+
+ bool canShowMIMEType() const { return m_canShowMIMEType; }
+
+private:
+ Ref<FrameInfo> m_frame;
+
+ WebCore::ResourceRequest m_request;
+ WebCore::ResourceResponse m_response;
+ bool m_canShowMIMEType;
+};
+
+} // namespace API
+
+#endif // APINavigationResponse_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKFrameInfomm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfo.mm 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -28,34 +28,28 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import "WebFrameProxy.h"
-#import <wtf/RetainPtr.h>
</del><ins>+@implementation WKFrameInfo
</ins><span class="cx">
</span><del>-@implementation WKFrameInfo {
- RetainPtr<NSURLRequest> _request;
-}
-
-- (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy
</del><ins>+- (void)dealloc
</ins><span class="cx"> {
</span><del>- if (!(self = [super init]))
- return nil;
</del><ins>+ _frameInfo->~FrameInfo();
</ins><span class="cx">
</span><del>- _mainFrame = webFrameProxy.isMainFrame();
-
- // FIXME: This should use the full request of the frame, not just the URL.
- _request = [NSURLRequest requestWithURL:[NSURL URLWithString:webFrameProxy.url()]];
-
- return self;
</del><ins>+ [super dealloc];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><del>- return [NSString stringWithFormat:@"<%@: %p; isMainFrame = %s; request = %@>", NSStringFromClass(self.class), self, _mainFrame ? "YES" : "NO", _request.get()];
</del><ins>+ return [NSString stringWithFormat:@"<%@: %p; isMainFrame = %s; request = %@>", NSStringFromClass(self.class), self, self.mainFrame ? "YES" : "NO", self.request];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)isMainFrame
+{
+ return _frameInfo->isMainFrame();
+}
+
</ins><span class="cx"> - (NSURLRequest *)request
</span><span class="cx"> {
</span><del>- return _request.get();
</del><ins>+ return _frameInfo->request().nsURLRequest(WebCore::DoNotUpdateHTTPBody);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)copyWithZone:(NSZone *)zone
</span><span class="lines">@@ -63,6 +57,13 @@
</span><span class="cx"> return [self retain];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_frameInfo;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKFrameInfoInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKFrameInfoInternal.h 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -27,14 +27,24 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-namespace WebKit {
-class WebFrameProxy;
</del><ins>+#import "APIFrameInfo.h"
+#import "WKObject.h"
+
+namespace API {
+
+inline WKFrameInfo *wrapper(API::FrameInfo& frameInfo)
+{
+ ASSERT([frameInfo.wrapper() isKindOfClass:[WKFrameInfo class]]);
+
+ return (WKFrameInfo *)frameInfo.wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-@interface WKFrameInfo ()
</del><ins>+}
</ins><span class="cx">
</span><del>-- (instancetype)initWithWebFrameProxy:(WebKit::WebFrameProxy&)webFrameProxy;
-
</del><ins>+@interface WKFrameInfo () <WKObject> {
+@package
+ API::ObjectStorage<API::FrameInfo> _frameInfo;
+}
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -29,16 +29,10 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "NavigationActionData.h"
</span><ins>+#import "WKFrameInfoInternal.h"
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-@implementation WKNavigationAction {
- RetainPtr<WKFrameInfo> _sourceFrame;
- RetainPtr<WKFrameInfo> _targetFrame;
- RetainPtr<NSURLRequest> _request;
- RetainPtr<NSURL> _originalURL;
- BOOL _userInitiated;
- BOOL _canHandleRequest;
-}
</del><ins>+@implementation WKNavigationAction
</ins><span class="cx">
</span><span class="cx"> static WKNavigationType toWKNavigationType(WebCore::NavigationType navigationType)
</span><span class="cx"> {
</span><span class="lines">@@ -103,82 +97,79 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-- (instancetype)_initWithNavigationActionData:(const WebKit::NavigationActionData&)navigationActionData
</del><ins>+- (void)dealloc
</ins><span class="cx"> {
</span><del>- if (!(self = [super init]))
- return nil;
</del><ins>+ _navigationAction->~NavigationAction();
</ins><span class="cx">
</span><del>- _navigationType = toWKNavigationType(navigationActionData.navigationType);
-
-#if PLATFORM(MAC)
- _modifierFlags = toNSEventModifierFlags(navigationActionData.modifiers);
- _buttonNumber = toNSButtonNumber(navigationActionData.mouseButton);
-#endif
-
- _userInitiated = navigationActionData.isProcessingUserGesture;
- _canHandleRequest = navigationActionData.canHandleRequest;
-
- return self;
</del><ins>+ [super dealloc];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><span class="cx"> return [NSString stringWithFormat:@"<%@: %p; navigationType = %ld; request = %@; sourceFrame = %@; targetFrame = %@>", NSStringFromClass(self.class), self,
</span><del>- (long)_navigationType, _request.get(), _sourceFrame.get(), _targetFrame.get()];
</del><ins>+ (long)self.navigationType, self.request, self.sourceFrame, self.targetFrame];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKFrameInfo *)sourceFrame
</span><span class="cx"> {
</span><del>- return _sourceFrame.get();
</del><ins>+ if (API::FrameInfo* frameInfo = _navigationAction->sourceFrame())
+ return wrapper(*frameInfo);
+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setSourceFrame:(WKFrameInfo *)sourceFrame
-{
- _sourceFrame = adoptNS([sourceFrame copy]);
-}
-
</del><span class="cx"> - (WKFrameInfo *)targetFrame
</span><span class="cx"> {
</span><del>- return _targetFrame.get();
</del><ins>+ if (API::FrameInfo* frameInfo = _navigationAction->targetFrame())
+ return wrapper(*frameInfo);
+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setTargetFrame:(WKFrameInfo *)targetFrame
</del><ins>+- (WKNavigationType)navigationType
</ins><span class="cx"> {
</span><del>- _targetFrame = adoptNS([targetFrame copy]);
</del><ins>+ return toWKNavigationType(_navigationAction->navigationType());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURLRequest *)request
</span><span class="cx"> {
</span><del>- return _request.get();
</del><ins>+ return _navigationAction->request().nsURLRequest(WebCore::DoNotUpdateHTTPBody);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setRequest:(NSURLRequest *)request
</del><ins>+#if PLATFORM(MAC)
+- (NSEventModifierFlags)modifierFlags
</ins><span class="cx"> {
</span><del>- _request = adoptNS([request copy]);
</del><ins>+ return toNSEventModifierFlags(_navigationAction->modifiers());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_setOriginalURL:(NSURL *)originalURL
</del><ins>+- (NSInteger)buttonNumber
</ins><span class="cx"> {
</span><del>- _originalURL = adoptNS([originalURL copy]);
</del><ins>+ return toNSButtonNumber(_navigationAction->mouseButton());
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><del>-- (NSURL *)_originalURL
</del><ins>+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
</ins><span class="cx"> {
</span><del>- return _originalURL.get();
</del><ins>+ return *_navigationAction;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKNavigationAction (WKPrivate)
</span><span class="cx">
</span><ins>+- (NSURL *)_originalURL
+{
+ return _navigationAction->originalURL();
+}
+
</ins><span class="cx"> - (BOOL)_isUserInitiated
</span><span class="cx"> {
</span><del>- return _userInitiated;
</del><ins>+ return _navigationAction->isProcessingUserGesture();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)_canHandleRequest
</span><span class="cx"> {
</span><del>- return _canHandleRequest;
</del><ins>+ return _navigationAction->canHandleRequest();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -27,23 +27,24 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebCore/FrameLoaderTypes.h>
</del><ins>+#import "APINavigationAction.h"
+#import "WKObject.h"
</ins><span class="cx">
</span><del>-namespace WebKit {
-struct NavigationActionData;
-}
</del><ins>+namespace API {
</ins><span class="cx">
</span><del>-@interface WKNavigationAction ()
</del><ins>+inline WKNavigationAction *wrapper(API::NavigationAction& navigationAction)
+{
+ ASSERT([navigationAction.wrapper() isKindOfClass:[WKNavigationAction class]]);
</ins><span class="cx">
</span><del>-@property (nonatomic, readwrite, copy) WKFrameInfo *sourceFrame;
-@property (nonatomic, readwrite, copy) WKFrameInfo *targetFrame;
</del><ins>+ return (WKNavigationAction *)navigationAction.wrapper();
+}
</ins><span class="cx">
</span><del>-@property (nonatomic, readwrite, copy) NSURLRequest *request;
</del><ins>+}
</ins><span class="cx">
</span><del>-@property (nonatomic, readwrite, copy, setter=_setOriginalURL:) NSURL *_originalURL;
-
-- (instancetype)_initWithNavigationActionData:(const WebKit::NavigationActionData&)navigationActionData;
-
</del><ins>+@interface WKNavigationAction () <WKObject> {
+@package
+ API::ObjectStorage<API::NavigationAction> _navigationAction;
+}
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationResponsemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.mm 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -28,45 +28,56 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <wtf/RetainPtr.h>
-#import "WKFrameInfo.h"
</del><ins>+#import "WKFrameInfoInternal.h"
</ins><span class="cx">
</span><del>-@implementation WKNavigationResponse {
- RetainPtr<NSURLResponse> _response;
</del><ins>+@implementation WKNavigationResponse
+
+- (void)dealloc
+{
+ _navigationResponse->~NavigationResponse();
+
+ [super dealloc];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><del>- return [NSString stringWithFormat:@"<%@: %p; response = %@>", NSStringFromClass(self.class), self, _response.get()];
</del><ins>+ return [NSString stringWithFormat:@"<%@: %p; response = %@>", NSStringFromClass(self.class), self, self.response];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isForMainFrame
</span><span class="cx"> {
</span><del>- return [_frame isMainFrame];
</del><ins>+ return _navigationResponse->frame().isMainFrame();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURLResponse *)response
</span><span class="cx"> {
</span><del>- return _response.get();
</del><ins>+ return _navigationResponse->response().nsURLResponse();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setResponse:(NSURLResponse *)response
</del><ins>+- (BOOL)canShowMIMEType
</ins><span class="cx"> {
</span><del>- _response = adoptNS([response copy]);
</del><ins>+ return _navigationResponse->canShowMIMEType();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_navigationResponse;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKNavigationResponse (WKPrivate)
</span><span class="cx">
</span><span class="cx"> - (WKFrameInfo *)_frame
</span><span class="cx"> {
</span><del>- return _frame.get();
</del><ins>+ return wrapper(_navigationResponse->frame());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSURLRequest *)_request
</span><span class="cx"> {
</span><del>- return _request.get();
</del><ins>+ return _navigationResponse->request().nsURLRequest(WebCore::DoNotUpdateHTTPBody);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationResponseInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponseInternal.h (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponseInternal.h 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponseInternal.h 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -27,17 +27,24 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <wtf/RetainPtr.h>
</del><ins>+#import "APINavigationResponse.h"
+#import "WKObject.h"
</ins><span class="cx">
</span><del>-@interface WKNavigationResponse () {
-@package
- RetainPtr<WKFrameInfo> _frame;
- RetainPtr<NSURLRequest> _request;
</del><ins>+namespace API {
+
+inline WKNavigationResponse *wrapper(API::NavigationResponse& navigationResponse)
+{
+ ASSERT([navigationResponse.wrapper() isKindOfClass:[WKNavigationResponse class]]);
+
+ return (WKNavigationResponse *)navigationResponse.wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-@property (nonatomic, readwrite, copy) NSURLResponse *response;
-@property (nonatomic, readwrite) BOOL canShowMIMEType;
</del><ins>+}
</ins><span class="cx">
</span><ins>+@interface WKNavigationResponse () <WKObject> {
+@package
+ API::ObjectStorage<API::NavigationResponse> _navigationResponse;
+}
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void didPostMessage(WebKit::WebPageProxy& page, WebKit::WebFrameProxy& frame, WebCore::SerializedScriptValue& serializedScriptValue)
</span><span class="cx"> {
</span><del>- RetainPtr<WKFrameInfo> frameInfo = adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:frame]);
</del><ins>+ RetainPtr<WKFrameInfo> frameInfo = wrapper(API::FrameInfo::create(frame));
</ins><span class="cx">
</span><span class="cx"> RetainPtr<JSContext> context = adoptNS([[JSContext alloc] init]);
</span><span class="cx"> JSValueRef valueRef = serializedScriptValue.deserialize([context JSGlobalContextRef], 0);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -28,7 +28,9 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "APIFrameInfo.h"
</ins><span class="cx"> #import "APINavigationData.h"
</span><ins>+#import "APINavigationResponse.h"
</ins><span class="cx"> #import "APIString.h"
</span><span class="cx"> #import "APIURL.h"
</span><span class="cx"> #import "AuthenticationDecisionListener.h"
</span><span class="lines">@@ -224,9 +226,9 @@
</span><span class="cx">
</span><span class="cx"> void NavigationState::PolicyClient::decidePolicyForNavigationAction(WebPageProxy&, WebFrameProxy* destinationFrame, const NavigationActionData& navigationActionData, WebFrameProxy* sourceFrame, const WebCore::ResourceRequest& originalRequest, const WebCore::ResourceRequest& request, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData)
</span><span class="cx"> {
</span><del>- RetainPtr<NSURLRequest> nsURLRequest = adoptNS(wrapper(*API::URLRequest::create(request).leakRef()));
-
</del><span class="cx"> if (!m_navigationState.m_navigationDelegateMethods.webViewDecidePolicyForNavigationActionDecisionHandler) {
</span><ins>+ RetainPtr<NSURLRequest> nsURLRequest = adoptNS(wrapper(*API::URLRequest::create(request).leakRef()));
+
</ins><span class="cx"> if (!destinationFrame) {
</span><span class="cx"> listener->use();
</span><span class="cx"> return;
</span><span class="lines">@@ -251,24 +253,22 @@
</span><span class="cx"> if (!navigationDelegate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto navigationAction = adoptNS([[WKNavigationAction alloc] _initWithNavigationActionData:navigationActionData]);
</del><ins>+ RefPtr<API::FrameInfo> destinationFrameInfo;
+ RefPtr<API::FrameInfo> sourceFrameInfo;
</ins><span class="cx">
</span><span class="cx"> if (destinationFrame)
</span><del>- [navigationAction setTargetFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*destinationFrame]).get()];
</del><ins>+ destinationFrameInfo = API::FrameInfo::create(*destinationFrame);
</ins><span class="cx">
</span><del>- if (sourceFrame) {
- if (sourceFrame == destinationFrame)
- [navigationAction setSourceFrame:[navigationAction targetFrame]];
- else
- [navigationAction setSourceFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*sourceFrame]).get()];
- }
</del><ins>+ if (sourceFrame == destinationFrame)
+ sourceFrameInfo = destinationFrameInfo;
+ else if (sourceFrame)
+ sourceFrameInfo = API::FrameInfo::create(*sourceFrame);
</ins><span class="cx">
</span><del>- [navigationAction setRequest:nsURLRequest.get()];
- [navigationAction _setOriginalURL:originalRequest.url()];
</del><ins>+ auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.get(), destinationFrameInfo.get(), request, originalRequest.url());
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebFramePolicyListenerProxy> localListener = WTF::move(listener);
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(webView:decidePolicyForNavigationAction:decisionHandler:));
</span><del>- [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:navigationAction.get() decisionHandler:[localListener, checker](WKNavigationActionPolicy actionPolicy) {
</del><ins>+ [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:wrapper(navigationAction) decisionHandler:[localListener, checker](WKNavigationActionPolicy actionPolicy) {
</ins><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx">
</span><span class="cx"> switch (actionPolicy) {
</span><span class="lines">@@ -322,16 +322,11 @@
</span><span class="cx"> if (!navigationDelegate)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto navigationResponse = adoptNS([[WKNavigationResponse alloc] init]);
</del><ins>+ auto navigationResponse = API::NavigationResponse::create(API::FrameInfo::create(frame).get(), resourceRequest, resourceResponse, canShowMIMEType);
</ins><span class="cx">
</span><del>- navigationResponse->_frame = adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:frame]);
- navigationResponse->_request = resourceRequest.nsURLRequest(WebCore::DoNotUpdateHTTPBody);
- [navigationResponse setResponse:resourceResponse.nsURLResponse()];
- [navigationResponse setCanShowMIMEType:canShowMIMEType];
-
</del><span class="cx"> RefPtr<WebFramePolicyListenerProxy> localListener = WTF::move(listener);
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(navigationDelegate.get(), @selector(webView:decidePolicyForNavigationResponse:decisionHandler:));
</span><del>- [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationResponse:navigationResponse.get() decisionHandler:[localListener, checker](WKNavigationResponsePolicy responsePolicy) {
</del><ins>+ [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationResponse:wrapper(navigationResponse) decisionHandler:[localListener, checker](WKNavigationResponsePolicy responsePolicy) {
</ins><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx">
</span><span class="cx"> switch (responsePolicy) {
</span><span class="lines">@@ -426,7 +421,7 @@
</span><span class="cx"> auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
</span><span class="cx"> auto errorWithRecoveryAttempter = createErrorWithRecoveryAttempter(m_navigationState.m_webView, webFrameProxy, error);
</span><span class="cx"> // FIXME: Get the main frame's current navigation.
</span><del>- [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView navigation:nil didFailProvisionalLoadInSubframe:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:webFrameProxy]).get() withError:errorWithRecoveryAttempter.get()];
</del><ins>+ [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView navigation:nil didFailProvisionalLoadInSubframe:wrapper(API::FrameInfo::create(webFrameProxy)) withError:errorWithRecoveryAttempter.get()];
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -102,13 +102,11 @@
</span><span class="cx"> auto configuration = adoptNS([m_uiDelegate.m_webView->_configuration copy]);
</span><span class="cx"> [configuration _setRelatedWebView:m_uiDelegate.m_webView];
</span><span class="cx">
</span><del>- auto navigationAction = adoptNS([[WKNavigationAction alloc] _initWithNavigationActionData:navigationActionData]);
</del><ins>+ auto sourceFrameInfo = API::FrameInfo::create(*initiatingFrame);
+ auto navigationAction = API::NavigationAction::create(navigationActionData, sourceFrameInfo.ptr(), nullptr, request, WebCore::URL());
</ins><span class="cx">
</span><del>- [navigationAction setSourceFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*initiatingFrame]).get()];
- [navigationAction setRequest:request.nsURLRequest(WebCore::DoNotUpdateHTTPBody)];
</del><ins>+ RetainPtr<WKWebView> webView = [delegate.get() webView:m_uiDelegate.m_webView createWebViewWithConfiguration:configuration.get() forNavigationAction:wrapper(navigationAction) windowFeatures:adoptNS([[WKWindowFeatures alloc] _initWithWindowFeatures:windowFeatures]).get()];
</ins><span class="cx">
</span><del>- RetainPtr<WKWebView> webView = [delegate.get() webView:m_uiDelegate.m_webView createWebViewWithConfiguration:configuration.get() forNavigationAction:navigationAction.get() windowFeatures:adoptNS([[WKWindowFeatures alloc] _initWithWindowFeatures:windowFeatures]).get()];
-
</del><span class="cx"> if (!webView)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -132,7 +130,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:));
</span><del>- [delegate webView:m_uiDelegate.m_webView runJavaScriptAlertPanelWithMessage:message initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() completionHandler:[completionHandler, checker] {
</del><ins>+ [delegate webView:m_uiDelegate.m_webView runJavaScriptAlertPanelWithMessage:message initiatedByFrame:wrapper(API::FrameInfo::create(*webFrameProxy)) completionHandler:[completionHandler, checker] {
</ins><span class="cx"> completionHandler();
</span><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx"> }];
</span><span class="lines">@@ -152,7 +150,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:completionHandler:));
</span><del>- [delegate webView:m_uiDelegate.m_webView runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() completionHandler:[completionHandler, checker](BOOL result) {
</del><ins>+ [delegate webView:m_uiDelegate.m_webView runJavaScriptConfirmPanelWithMessage:message initiatedByFrame:wrapper(API::FrameInfo::create(*webFrameProxy)) completionHandler:[completionHandler, checker](BOOL result) {
</ins><span class="cx"> completionHandler(result);
</span><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx"> }];
</span><span class="lines">@@ -172,7 +170,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CompletionHandlerCallChecker> checker = CompletionHandlerCallChecker::create(delegate.get(), @selector(webView:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:completionHandler:));
</span><del>- [delegate webView:m_uiDelegate.m_webView runJavaScriptTextInputPanelWithPrompt:message defaultText:defaultValue initiatedByFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*webFrameProxy]).get() completionHandler:[completionHandler, checker](NSString *result) {
</del><ins>+ [delegate webView:m_uiDelegate.m_webView runJavaScriptTextInputPanelWithPrompt:message defaultText:defaultValue initiatedByFrame:wrapper(API::FrameInfo::create(*webFrameProxy)) completionHandler:[completionHandler, checker](NSString *result) {
</ins><span class="cx"> completionHandler(result);
</span><span class="cx"> checker->didCallCompletionHandler();
</span><span class="cx"> }];
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (179327 => 179328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-29 02:52:30 UTC (rev 179327)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-29 03:05:12 UTC (rev 179328)
</span><span class="lines">@@ -253,7 +253,6 @@
</span><span class="cx"> 1A4D664818A2D91A00D82E21 /* APIUIClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4D664718A2D91A00D82E21 /* APIUIClient.h */; };
</span><span class="cx"> 1A4D664B18A3030E00D82E21 /* WKFrameInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */; };
</span><span class="cx"> 1A4D664C18A3030E00D82E21 /* WKFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><del>- 1A4D664E18A3031B00D82E21 /* WKFrameInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */; };
</del><span class="cx"> 1A50DB66110A3D57000D3FE5 /* WebProcess.app in Copy Files */ = {isa = PBXBuildFile; fileRef = 1A50DB1E110A3BDC000D3FE5 /* WebProcess.app */; };
</span><span class="cx"> 1A52C0F71A38CDC70016160A /* WebStorageNamespaceProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A52C0F51A38CDC70016160A /* WebStorageNamespaceProvider.cpp */; };
</span><span class="cx"> 1A52C0F81A38CDC70016160A /* WebStorageNamespaceProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A52C0F61A38CDC70016160A /* WebStorageNamespaceProvider.h */; };
</span><span class="lines">@@ -652,6 +651,11 @@
</span><span class="cx"> 2DE6943D18BD2A68005C15E5 /* SmartMagnificationControllerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DE6943B18BD2A68005C15E5 /* SmartMagnificationControllerMessageReceiver.cpp */; };
</span><span class="cx"> 2DE6943E18BD2A68005C15E5 /* SmartMagnificationControllerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DE6943C18BD2A68005C15E5 /* SmartMagnificationControllerMessages.h */; };
</span><span class="cx"> 2DF9593B18A42412009785A1 /* ViewGestureControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2DF9593418A42412009785A1 /* ViewGestureControllerIOS.mm */; };
</span><ins>+ 2DF9EEE51A781FB400B6CFBE /* APIFrameInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2DF9EEE31A781FB400B6CFBE /* APIFrameInfo.cpp */; };
+ 2DF9EEE61A781FB400B6CFBE /* APIFrameInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEE41A781FB400B6CFBE /* APIFrameInfo.h */; };
+ 2DF9EEE81A78245500B6CFBE /* WKFrameInfoInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */; };
+ 2DF9EEEC1A7836EE00B6CFBE /* APINavigationAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */; };
+ 2DF9EEEE1A786EAD00B6CFBE /* APINavigationResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */; };
</ins><span class="cx"> 31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */; };
</span><span class="cx"> 310999C7146C9E3D0029DEB9 /* WebNotificationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 31099968146C71F50029DEB9 /* WebNotificationClient.h */; };
</span><span class="cx"> 312C0C4A146DDC8A0016C911 /* WKNotificationProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2291,7 +2295,6 @@
</span><span class="cx"> 1A4D664718A2D91A00D82E21 /* APIUIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUIClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKFrameInfo.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameInfo.h; sourceTree = "<group>"; };
</span><del>- 1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameInfoInternal.h; sourceTree = "<group>"; };
</del><span class="cx"> 1A4F976A100E7B6600637A18 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1A4F976B100E7B6600637A18 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1A4F976C100E7B6600637A18 /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -2743,6 +2746,11 @@
</span><span class="cx"> 2DE6943B18BD2A68005C15E5 /* SmartMagnificationControllerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmartMagnificationControllerMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2DE6943C18BD2A68005C15E5 /* SmartMagnificationControllerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SmartMagnificationControllerMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 2DF9593418A42412009785A1 /* ViewGestureControllerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ViewGestureControllerIOS.mm; path = ios/ViewGestureControllerIOS.mm; sourceTree = "<group>"; };
</span><ins>+ 2DF9EEE31A781FB400B6CFBE /* APIFrameInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIFrameInfo.cpp; sourceTree = "<group>"; };
+ 2DF9EEE41A781FB400B6CFBE /* APIFrameInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFrameInfo.h; sourceTree = "<group>"; };
+ 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameInfoInternal.h; sourceTree = "<group>"; };
+ 2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationAction.h; sourceTree = "<group>"; };
+ 2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APINavigationResponse.h; sourceTree = "<group>"; };
</ins><span class="cx"> 31099968146C71F50029DEB9 /* WebNotificationClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 31099971146C759B0029DEB9 /* WebNotificationClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationClient.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 312C0C49146DDC8A0016C911 /* WKNotificationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNotificationProvider.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5225,7 +5233,7 @@
</span><span class="cx"> 37B5045119EEF31300CE2CF8 /* WKErrorPrivate.h */,
</span><span class="cx"> 1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */,
</span><span class="cx"> 1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */,
</span><del>- 1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */,
</del><ins>+ 2DF9EEE71A78245500B6CFBE /* WKFrameInfoInternal.h */,
</ins><span class="cx"> 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */,
</span><span class="cx"> 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */,
</span><span class="cx"> 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */,
</span><span class="lines">@@ -6122,12 +6130,16 @@
</span><span class="cx"> 1F7D36C018DA513F00D9D659 /* APIDownloadClient.h */,
</span><span class="cx"> 00B9661518E24CBA00CE1F88 /* APIFindClient.h */,
</span><span class="cx"> 37E25D6D18FDE5D6005D3A00 /* APIFormClient.h */,
</span><ins>+ 2DF9EEE31A781FB400B6CFBE /* APIFrameInfo.cpp */,
+ 2DF9EEE41A781FB400B6CFBE /* APIFrameInfo.h */,
</ins><span class="cx"> 7CE4D2061A46775700C7F152 /* APILegacyContextHistoryClient.h */,
</span><span class="cx"> 1A2464F21891E45100234C5B /* APILoaderClient.h */,
</span><span class="cx"> 7CD3A4801A5D02FA009623B8 /* APINavigation.cpp */,
</span><span class="cx"> 7CD3A4811A5D02FA009623B8 /* APINavigation.h */,
</span><ins>+ 2DF9EEEA1A7836EE00B6CFBE /* APINavigationAction.h */,
</ins><span class="cx"> BCF69FA11176D01400471A52 /* APINavigationData.cpp */,
</span><span class="cx"> BCF69FA01176D01400471A52 /* APINavigationData.h */,
</span><ins>+ 2DF9EEED1A786EAD00B6CFBE /* APINavigationResponse.h */,
</ins><span class="cx"> 7C89D2951A6753B2003A5FDE /* APIPageConfiguration.cpp */,
</span><span class="cx"> 7C89D2961A6753B2003A5FDE /* APIPageConfiguration.h */,
</span><span class="cx"> 1AFDD3141891B54000153970 /* APIPolicyClient.h */,
</span><span class="lines">@@ -7509,6 +7521,7 @@
</span><span class="cx"> C0CE72AD1247E78D00BC0EC4 /* HandleMessage.h in Headers */,
</span><span class="cx"> 37F90DE31376560E0051CF68 /* HTTPCookieAcceptPolicy.h in Headers */,
</span><span class="cx"> 5175095A1897249700408FAC /* IDBIdentifier.h in Headers */,
</span><ins>+ 2DF9EEE81A78245500B6CFBE /* WKFrameInfoInternal.h in Headers */,
</ins><span class="cx"> 518353DB1885BF8C00D9FE44 /* IDBSerialization.h in Headers */,
</span><span class="cx"> 51E351CB180F2CCC00E53BE9 /* IDBUtilities.h in Headers */,
</span><span class="cx"> BCCF6B2512C93E7A008F9C35 /* ImageOptions.h in Headers */,
</span><span class="lines">@@ -7657,6 +7670,7 @@
</span><span class="cx"> 2DDE0AFA18298CC900F97EAA /* RemoteLayerTreePropertyApplier.h in Headers */,
</span><span class="cx"> 1AF1AC6C1651759E00C17D7F /* RemoteLayerTreeTransaction.h in Headers */,
</span><span class="cx"> E1B78471163F24690007B692 /* RemoteNetworkingContext.h in Headers */,
</span><ins>+ 2DF9EEE61A781FB400B6CFBE /* APIFrameInfo.h in Headers */,
</ins><span class="cx"> 1AC1338018590AE400F3EC05 /* RemoteObjectRegistry.h in Headers */,
</span><span class="cx"> 1AC1338618590C4600F3EC05 /* RemoteObjectRegistryMessages.h in Headers */,
</span><span class="cx"> 0F594790187B3B3A00437857 /* RemoteScrollingCoordinator.h in Headers */,
</span><span class="lines">@@ -7792,6 +7806,7 @@
</span><span class="cx"> BC1BE1E012D54A410004A228 /* WebGeolocationClient.h in Headers */,
</span><span class="cx"> BC0E5FE512D697160012A72A /* WebGeolocationManager.h in Headers */,
</span><span class="cx"> BC0E606212D6BA910012A72A /* WebGeolocationManagerMessages.h in Headers */,
</span><ins>+ 2DF9EEEC1A7836EE00B6CFBE /* APINavigationAction.h in Headers */,
</ins><span class="cx"> BC54CACB12D64291005C67B0 /* WebGeolocationManagerProxy.h in Headers */,
</span><span class="cx"> BC0E618312D6CB1D0012A72A /* WebGeolocationManagerProxyMessages.h in Headers */,
</span><span class="cx"> BC0E607312D6BC200012A72A /* WebGeolocationPosition.h in Headers */,
</span><span class="lines">@@ -8022,7 +8037,6 @@
</span><span class="cx"> 37DFA7001810BB92001F4A9F /* WKFoundation.h in Headers */,
</span><span class="cx"> BCD0139B110FA420003B8A67 /* WKFrame.h in Headers */,
</span><span class="cx"> 1A4D664C18A3030E00D82E21 /* WKFrameInfo.h in Headers */,
</span><del>- 1A4D664E18A3031B00D82E21 /* WKFrameInfoInternal.h in Headers */,
</del><span class="cx"> BCB9F6A51123DD0D00A137E0 /* WKFramePolicyListener.h in Headers */,
</span><span class="cx"> E1AEA22F14687BDB00804569 /* WKFullKeyboardAccessWatcher.h in Headers */,
</span><span class="cx"> CDCA85C9132ABA4E00E961DF /* WKFullScreenWindowController.h in Headers */,
</span><span class="lines">@@ -8116,6 +8130,7 @@
</span><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><ins>+ 2DF9EEEE1A786EAD00B6CFBE /* APINavigationResponse.h in Headers */,
</ins><span class="cx"> 518ACAEA12AEE6BB00B04B83 /* WKProtectionSpaceTypes.h in Headers */,
</span><span class="cx"> 1AD01BCD1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h in Headers */,
</span><span class="cx"> 1A9E329B1822E1CC00F5D04C /* WKRemoteObject.h in Headers */,
</span><span class="lines">@@ -9268,6 +9283,7 @@
</span><span class="cx"> 1ABC3DF51899E437004F0626 /* NavigationState.mm in Sources */,
</span><span class="cx"> 1A6FBA2B11E6862700DB1371 /* NetscapeBrowserFuncs.cpp in Sources */,
</span><span class="cx"> 1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */,
</span><ins>+ 2DF9EEE51A781FB400B6CFBE /* APIFrameInfo.cpp in Sources */,
</ins><span class="cx"> 1AE5B7FB11E7AED200BA6767 /* NetscapePluginMac.mm in Sources */,
</span><span class="cx"> 1A4A9C5512B816CF008FE984 /* NetscapePluginModule.cpp in Sources */,
</span><span class="cx"> 1A4A9C9A12B821CD008FE984 /* NetscapePluginModuleMac.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>