<!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>[168956] branches/safari-538.34.5-branch/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/168956">168956</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-16 01:41:00 -0700 (Fri, 16 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168690">r168690</a>.  </pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari538345branchSourceWebKit2ChangeLog">branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2SharedAPICocoaWKFoundationh">branches/safari-538.34.5-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKNavigationActionh">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKNavigationActionmm">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKNavigationActionInternalh">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessCocoaNavigationStatemm">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2UIProcessCocoaUIDelegatemm">branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari538345branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog (168955 => 168956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog        2014-05-16 08:39:39 UTC (rev 168955)
+++ branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog        2014-05-16 08:41:00 UTC (rev 168956)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2014-05-16  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r168690
+
+    2014-05-13  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+            Add -[WKNavigationAction modifierFlags] and -[WKNavigationAction buttonNumber]
+            https://bugs.webkit.org/show_bug.cgi?id=132880
+            &lt;rdar://problem/16901354&gt;
+
+            Reviewed by Dan Bernstein.
+
+            * Shared/API/Cocoa/WKFoundation.h:
+            Add typedef for older systems.
+
+            * UIProcess/API/Cocoa/WKNavigationAction.h:
+            Add -[WKNavigationAction modifierFlags] and -[WKNavigationAction buttonNumber]
+
+            * UIProcess/API/Cocoa/WKNavigationAction.mm:
+            (toWKNavigationType):
+            This can be static now.
+
+            (toNSEventModifierFlags):
+            Helper to convert WebEvent::Modifiers to NSEventModifierFlags.
+
+            (toNSButtonNumber):
+            Helper to convert WebMouseEvent::Button to an AppKit button number.
+
+            (-[WKNavigationAction initWithNavigationActionData:WebKit::]):
+            New initializer that takes a NavigationActionData and fills in the relevant ivars from it.
+
+            (-[WKNavigationAction _isUserInitiated]):
+            Return the new ivar.
+
+            * UIProcess/API/Cocoa/WKNavigationActionInternal.h:
+            Remove readwrite overrides.
+
+            * UIProcess/Cocoa/NavigationState.mm:
+            (WebKit::NavigationState::PolicyClient::decidePolicyForNavigationAction):
+            Use initWithNavigationActionData:
+
+            * UIProcess/Cocoa/UIDelegate.mm:
+            (WebKit::UIDelegate::UIClient::createNewPage):
+            Use initWithNavigationActionData:
+
+2014-05-16  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
</ins><span class="cx">         Merge r168637
</span><span class="cx"> 
</span><span class="cx">     2014-05-12  Anders Carlsson  &lt;andersca@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2SharedAPICocoaWKFoundationh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (168955 => 168956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h        2014-05-16 08:39:39 UTC (rev 168955)
+++ branches/safari-538.34.5-branch/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h        2014-05-16 08:41:00 UTC (rev 168956)
</span><span class="lines">@@ -43,6 +43,11 @@
</span><span class="cx"> #define WK_AVAILABLE(_mac, _ios)
</span><span class="cx"> #define WK_CLASS_AVAILABLE(_mac, _ios) __attribute__((visibility (&quot;default&quot;)))
</span><span class="cx"> #define WK_ENUM_AVAILABLE(_mac, _ios)
</span><ins>+
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &lt;= 1090
+typedef NSUInteger NSEventModifierFlags;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#endif
+
</ins><span class="cx"> #define WK_DESIGNATED_INITIALIZER
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKNavigationActionh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h (168955 => 168956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h        2014-05-16 08:39:39 UTC (rev 168955)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h        2014-05-16 08:41:00 UTC (rev 168956)
</span><span class="lines">@@ -27,7 +27,11 @@
</span><span class="cx"> 
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> 
</span><ins>+#if TARGET_OS_IPHONE
</ins><span class="cx"> #import &lt;Foundation/Foundation.h&gt;
</span><ins>+#else
+#import &lt;AppKit/AppKit.h&gt;
+#endif
</ins><span class="cx"> 
</span><span class="cx"> @class WKFrameInfo;
</span><span class="cx"> 
</span><span class="lines">@@ -49,7 +53,6 @@
</span><span class="cx">     WKNavigationTypeOther = -1,
</span><span class="cx"> } WK_ENUM_AVAILABLE(10_10, 8_0);
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> /*! Contains information about an action that may cause a navigation, used for making policy decisions.
</span><span class="cx">  */
</span><span class="cx"> WK_CLASS_AVAILABLE(10_10, 8_0)
</span><span class="lines">@@ -71,6 +74,18 @@
</span><span class="cx">  */
</span><span class="cx"> @property (nonatomic, readonly) NSURLRequest *request;
</span><span class="cx"> 
</span><ins>+#if !TARGET_OS_IPHONE
+
+/*! @abstract The modifier keys that were in effect when the navigation was requested.
+ */
+@property (nonatomic, readonly) NSEventModifierFlags modifierFlags;
+
+/*! @abstract The mouse button number that caused the navigation to be requested.
+ */
+@property (nonatomic, readonly) NSInteger buttonNumber;
+
+#endif
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKNavigationActionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm (168955 => 168956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm        2014-05-16 08:39:39 UTC (rev 168955)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.mm        2014-05-16 08:41:00 UTC (rev 168956)
</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 &quot;NavigationActionData.h&quot;
</ins><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> 
</span><span class="cx"> @implementation WKNavigationAction {
</span><span class="lines">@@ -35,8 +36,89 @@
</span><span class="cx">     RetainPtr&lt;WKFrameInfo&gt; _targetFrame;
</span><span class="cx">     RetainPtr&lt;NSURLRequest&gt; _request;
</span><span class="cx">     RetainPtr&lt;NSURL&gt; _originalURL;
</span><ins>+    BOOL _isUserInitiated;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static WKNavigationType toWKNavigationType(WebCore::NavigationType navigationType)
+{
+    switch (navigationType) {
+    case WebCore::NavigationTypeLinkClicked:
+        return WKNavigationTypeLinkActivated;
+    case WebCore::NavigationTypeFormSubmitted:
+        return WKNavigationTypeFormSubmitted;
+    case WebCore::NavigationTypeBackForward:
+        return WKNavigationTypeBackForward;
+    case WebCore::NavigationTypeReload:
+        return WKNavigationTypeReload;
+    case WebCore::NavigationTypeFormResubmitted:
+        return WKNavigationTypeFormResubmitted;
+    case WebCore::NavigationTypeOther:
+        return WKNavigationTypeOther;
+    }
+
+    ASSERT_NOT_REACHED();
+    return WKNavigationTypeOther;
+}
+
+#if PLATFORM(MAC)
+
+// FIXME: This really belongs in WebEventFactory.
+static NSEventModifierFlags toNSEventModifierFlags(WebKit::WebEvent::Modifiers modifiers)
+{
+    NSEventModifierFlags modifierFlags = 0;
+
+    if (modifiers &amp; WebKit::WebEvent::CapsLockKey)
+        modifierFlags |= NSAlphaShiftKeyMask;
+    if (modifiers &amp; WebKit::WebEvent::ShiftKey)
+        modifierFlags |= NSShiftKeyMask;
+    if (modifiers &amp; WebKit::WebEvent::ControlKey)
+        modifierFlags |= NSControlKeyMask;
+    if (modifiers &amp; WebKit::WebEvent::AltKey)
+        modifierFlags |= NSAlternateKeyMask;
+    if (modifiers &amp; WebKit::WebEvent::MetaKey)
+        modifierFlags |= NSCommandKeyMask;
+
+    return modifierFlags;
+}
+
+static NSInteger toNSButtonNumber(WebKit::WebMouseEvent::Button mouseButton)
+{
+    switch (mouseButton) {
+    case WebKit::WebMouseEvent::NoButton:
+        return 0;
+
+    case WebKit::WebMouseEvent::LeftButton:
+        return 1 &lt;&lt; 0;
+
+    case WebKit::WebMouseEvent::RightButton:
+        return 1 &lt;&lt; 1;
+
+    case WebKit::WebMouseEvent::MiddleButton:
+        return 1 &lt;&lt; 2;
+
+    default:
+        return 0;
+    }
+}
+#endif
+
+- (instancetype)_initWithNavigationActionData:(const WebKit::NavigationActionData&amp;)navigationActionData
+{
+    if (!(self = [super init]))
+        return nil;
+
+    _navigationType = toWKNavigationType(navigationActionData.navigationType);
+
+#if PLATFORM(MAC)
+    _modifierFlags = toNSEventModifierFlags(navigationActionData.modifiers);
+    _buttonNumber = toNSButtonNumber(navigationActionData.mouseButton);
+#endif
+
+    _isUserInitiated = navigationActionData.isProcessingUserGesture;
+
+    return self;
+}
+
</ins><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><span class="cx">     return [NSString stringWithFormat:@&quot;&lt;%@: %p; navigationType = %ld; request = %@; sourceFrame = %@; targetFrame = %@&gt;&quot;, NSStringFromClass(self.class), self,
</span><span class="lines">@@ -83,27 +165,11 @@
</span><span class="cx">     return _originalURL.get();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-@end
-
-WKNavigationType toWKNavigationType(WebCore::NavigationType navigationType)
</del><ins>+- (BOOL)_isUserInitiated
</ins><span class="cx"> {
</span><del>-    switch (navigationType) {
-    case WebCore::NavigationTypeLinkClicked:
-        return WKNavigationTypeLinkActivated;
-    case WebCore::NavigationTypeFormSubmitted:
-        return WKNavigationTypeFormSubmitted;
-    case WebCore::NavigationTypeBackForward:
-        return WKNavigationTypeBackForward;
-    case WebCore::NavigationTypeReload:
-        return WKNavigationTypeReload;
-    case WebCore::NavigationTypeFormResubmitted:
-        return WKNavigationTypeFormResubmitted;
-    case WebCore::NavigationTypeOther:
-        return WKNavigationTypeOther;
-    }
-
-    ASSERT_NOT_REACHED();
-    return WKNavigationTypeOther;
</del><ins>+    return _isUserInitiated;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+@end
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessAPICocoaWKNavigationActionInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h (168955 => 168956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h        2014-05-16 08:39:39 UTC (rev 168955)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationActionInternal.h        2014-05-16 08:41:00 UTC (rev 168956)
</span><span class="lines">@@ -29,19 +29,21 @@
</span><span class="cx"> 
</span><span class="cx"> #import &lt;WebCore/FrameLoaderTypes.h&gt;
</span><span class="cx"> 
</span><ins>+namespace WebKit {
+struct NavigationActionData;
+}
+
</ins><span class="cx"> @interface WKNavigationAction ()
</span><span class="cx"> 
</span><span class="cx"> @property (nonatomic, readwrite, strong) WKFrameInfo *sourceFrame;
</span><span class="cx"> @property (nonatomic, readwrite, strong) WKFrameInfo *targetFrame;
</span><span class="cx"> 
</span><del>-@property (nonatomic, readwrite) WKNavigationType navigationType;
</del><span class="cx"> @property (nonatomic, readwrite, copy) NSURLRequest *request;
</span><span class="cx"> 
</span><span class="cx"> @property (nonatomic, readwrite, copy, setter=_setOriginalURL:) NSURL *_originalURL;
</span><del>-@property (nonatomic, readwrite, getter=_isUserInitiated, setter=_setUserInitiated:) BOOL _userInitiated;
</del><span class="cx"> 
</span><ins>+- (instancetype)_initWithNavigationActionData:(const WebKit::NavigationActionData&amp;)navigationActionData;
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><del>-WKNavigationType toWKNavigationType(WebCore::NavigationType);
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (168955 => 168956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2014-05-16 08:39:39 UTC (rev 168955)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm        2014-05-16 08:41:00 UTC (rev 168956)
</span><span class="lines">@@ -248,8 +248,7 @@
</span><span class="cx">     if (!navigationDelegate)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    // FIXME: Set up the navigation action object.
-    auto navigationAction = adoptNS([[WKNavigationAction alloc] init]);
</del><ins>+    auto navigationAction = adoptNS([[WKNavigationAction alloc] _initWithNavigationActionData:navigationActionData]);
</ins><span class="cx"> 
</span><span class="cx">     if (destinationFrame)
</span><span class="cx">         [navigationAction setTargetFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*destinationFrame]).get()];
</span><span class="lines">@@ -261,10 +260,8 @@
</span><span class="cx">             [navigationAction setSourceFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*sourceFrame]).get()];
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    [navigationAction setNavigationType:toWKNavigationType(navigationActionData.navigationType)];
</del><span class="cx">     [navigationAction setRequest:request.nsURLRequest(WebCore::DoNotUpdateHTTPBody)];
</span><span class="cx">     [navigationAction _setOriginalURL:originalRequest.url()];
</span><del>-    [navigationAction _setUserInitiated:navigationActionData.isProcessingUserGesture];
</del><span class="cx"> 
</span><span class="cx">     [navigationDelegate webView:m_navigationState.m_webView decidePolicyForNavigationAction:navigationAction.get() decisionHandler:[listener](WKNavigationActionPolicy actionPolicy) {
</span><span class="cx">         switch (actionPolicy) {
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (168955 => 168956)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm        2014-05-16 08:39:39 UTC (rev 168955)
+++ branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm        2014-05-16 08:41:00 UTC (rev 168956)
</span><span class="lines">@@ -92,12 +92,10 @@
</span><span class="cx">     auto configuration = adoptNS([m_uiDelegate.m_webView-&gt;_configuration copy]);
</span><span class="cx">     [configuration _setRelatedWebView:m_uiDelegate.m_webView];
</span><span class="cx"> 
</span><del>-    auto navigationAction = adoptNS([[WKNavigationAction alloc] init]);
</del><ins>+    auto navigationAction = adoptNS([[WKNavigationAction alloc] _initWithNavigationActionData:navigationActionData]);
</ins><span class="cx"> 
</span><span class="cx">     [navigationAction setSourceFrame:adoptNS([[WKFrameInfo alloc] initWithWebFrameProxy:*initiatingFrame]).get()];
</span><del>-    [navigationAction setNavigationType:toWKNavigationType(navigationActionData.navigationType)];
</del><span class="cx">     [navigationAction setRequest:request.nsURLRequest(WebCore::DoNotUpdateHTTPBody)];
</span><del>-    [navigationAction _setUserInitiated:navigationActionData.isProcessingUserGesture];
</del><span class="cx"> 
</span><span class="cx">     RetainPtr&lt;WKWebView&gt; webView = [delegate.get() webView:m_uiDelegate.m_webView createWebViewWithConfiguration:configuration.get() forNavigationAction:navigationAction.get() windowFeatures:adoptNS([[WKWindowFeatures alloc] _initWithWindowFeatures:windowFeatures]).get()];
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>