<!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>[178809] branches/safari-600.4-branch</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/178809">178809</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 23:37:52 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/178679">r178679</a>. rdar://problem/19448129</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6004branchSourceWebCoreChangeLog">branches/safari-600.4-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6004branchSourceWebCoreplatformspimacNSViewSPIh">branches/safari-600.4-branch/Source/WebCore/platform/spi/mac/NSViewSPI.h</a></li>
<li><a href="#branchessafari6004branchSourceWebKitmacChangeLog">branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari6004branchSourceWebKitmacWebViewWebActionMenuControllermm">branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm</a></li>
<li><a href="#branchessafari6004branchSourceWebKitmacWebViewWebViewmm">branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari6004branchSourceWebKit2ChangeLog">branches/safari-600.4-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6004branchSourceWebKit2UIProcessAPImacWKViewmm">branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#branchessafari6004branchSourceWebKit2UIProcessmacWKActionMenuControllermm">branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm</a></li>
<li><a href="#branchessafari6004branchToolsChangeLog">branches/safari-600.4-branch/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6004branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebCore/ChangeLog (178808 => 178809)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebCore/ChangeLog 2015-01-21 07:23:18 UTC (rev 178808)
+++ branches/safari-600.4-branch/Source/WebCore/ChangeLog 2015-01-21 07:37:52 UTC (rev 178809)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Rollout r178679. rdar://problem/19448129
+
+2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r178679. rdar://problem/19448129
</span><span class="cx">
</span><span class="cx"> 2015-01-19 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebCoreplatformspimacNSViewSPIh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebCore/platform/spi/mac/NSViewSPI.h (178808 => 178809)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebCore/platform/spi/mac/NSViewSPI.h 2015-01-21 07:23:18 UTC (rev 178808)
+++ branches/safari-600.4-branch/Source/WebCore/platform/spi/mac/NSViewSPI.h 2015-01-21 07:37:52 UTC (rev 178809)
</span><span class="lines">@@ -23,10 +23,16 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// FIXME: This should include private headers when possible.
</del><ins>+#if USE(APPLE_INTERNAL_SDK) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101002
</ins><span class="cx">
</span><ins>+#import <AppKit/NSView_Private.h>
+
+#else
+
</ins><span class="cx"> #import <AppKit/NSView.h>
</span><span class="cx">
</span><span class="cx"> @interface NSView (Private)
</span><del>-@property (strong) NSMenu *_actionMenu;
</del><ins>+@property (strong) NSMenu *actionMenu;
</ins><span class="cx"> @end
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="branchessafari6004branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog (178808 => 178809)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog 2015-01-21 07:23:18 UTC (rev 178808)
+++ branches/safari-600.4-branch/Source/WebKit/mac/ChangeLog 2015-01-21 07:37:52 UTC (rev 178809)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Rollout r178679. rdar://problem/19448129
+
+2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r178680. rdar://problem/19489593
</span><span class="cx">
</span><span class="cx"> 2015-01-19 Beth Dakin <bdakin@apple.com>
</span><span class="lines">@@ -11,28 +15,6 @@
</span><span class="cx">
</span><span class="cx"> 2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><del>- Merge r178679. rdar://problem/19448129
-
- 2015-01-19 Timothy Horton <timothy_horton@apple.com>
-
- Adjust naming of action menu SPI
- https://bugs.webkit.org/show_bug.cgi?id=140644
- <rdar://problem/19448129>
-
- Reviewed by Brian Weinstein.
-
- * WebView/WebActionMenuController.mm:
- (-[WebActionMenuController prepareForMenu:withEvent:]):
- (-[WebActionMenuController willOpenMenu:withEvent:]):
- (-[WebActionMenuController didCloseMenu:withEvent:]):
- * WebView/WebView.mm:
- (-[WebView _commonInitializationWithFrameName:groupName:]):
- (-[WebView prepareForMenu:withEvent:]):
- (-[WebView willOpenMenu:withEvent:]):
- (-[WebView didCloseMenu:withEvent:]):
-
-2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
-
</del><span class="cx"> Merge r178676. rdar://problem/19489593
</span><span class="cx">
</span><span class="cx"> 2015-01-19 Beth Dakin <bdakin@apple.com>
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKitmacWebViewWebActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (178808 => 178809)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-01-21 07:23:18 UTC (rev 178808)
+++ branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2015-01-21 07:37:52 UTC (rev 178809)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> if (!_webView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSMenu *actionMenu = _webView._actionMenu;
</del><ins>+ NSMenu *actionMenu = _webView.actionMenu;
</ins><span class="cx"> if (menu != actionMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (menu != _webView._actionMenu)
</del><ins>+ if (menu != _webView.actionMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!menu.numberOfItems)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)didCloseMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (menu != _webView._actionMenu)
</del><ins>+ if (menu != _webView.actionMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (_currentActionContext && _hasActivatedActionContext) {
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebView.mm (178808 => 178809)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-21 07:23:18 UTC (rev 178808)
+++ branches/safari-600.4-branch/Source/WebKit/mac/WebView/WebView.mm 2015-01-21 07:37:52 UTC (rev 178809)
</span><span class="lines">@@ -893,9 +893,9 @@
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> if ([self respondsToSelector:@selector(setActionMenu:)]) {
</span><span class="cx"> RetainPtr<NSMenu> actionMenu = adoptNS([[NSMenu alloc] init]);
</span><del>- self._actionMenu = actionMenu.get();
</del><ins>+ self.actionMenu = actionMenu.get();
</ins><span class="cx"> _private->actionMenuController = [[WebActionMenuController alloc] initWithWebView:self];
</span><del>- self._actionMenu.autoenablesItems = NO;
</del><ins>+ self.actionMenu.autoenablesItems = NO;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
</span><span class="lines">@@ -8585,7 +8585,7 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> - (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (menu != self._actionMenu)
</del><ins>+ if (menu != self.actionMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [_private->actionMenuController prepareForMenu:menu withEvent:event];
</span><span class="lines">@@ -8593,7 +8593,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (menu != self._actionMenu)
</del><ins>+ if (menu != self.actionMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [_private->actionMenuController willOpenMenu:menu withEvent:event];
</span><span class="lines">@@ -8601,7 +8601,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)didCloseMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (menu != self._actionMenu)
</del><ins>+ if (menu != self.actionMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [_private->actionMenuController didCloseMenu:menu withEvent:event];
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit2/ChangeLog (178808 => 178809)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-21 07:23:18 UTC (rev 178808)
+++ branches/safari-600.4-branch/Source/WebKit2/ChangeLog 2015-01-21 07:37:52 UTC (rev 178809)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Rollout r178679. rdar://problem/19448129
+
+2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r178679. rdar://problem/19448129
</span><span class="cx">
</span><span class="cx"> 2015-01-19 Timothy Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm (178808 => 178809)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-21 07:23:18 UTC (rev 178808)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-01-21 07:37:52 UTC (rev 178809)
</span><span class="lines">@@ -3614,10 +3614,10 @@
</span><span class="cx"> #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><span class="cx"> if ([self respondsToSelector:@selector(setActionMenu:)]) {
</span><span class="cx"> RetainPtr<NSMenu> menu = adoptNS([[NSMenu alloc] init]);
</span><del>- self._actionMenu = menu.get();
</del><ins>+ self.actionMenu = menu.get();
</ins><span class="cx"> _data->_actionMenuController = adoptNS([[WKActionMenuController alloc] initWithPage:*_data->_page view:self]);
</span><del>- self._actionMenu.delegate = _data->_actionMenuController.get();
- self._actionMenu.autoenablesItems = NO;
</del><ins>+ self.actionMenu.delegate = _data->_actionMenuController.get();
+ self.actionMenu.autoenablesItems = NO;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (Class gestureClass = NSClassFromString(@"NSImmediateActionGestureRecognizer")) {
</span></span></pre></div>
<a id="branchessafari6004branchSourceWebKit2UIProcessmacWKActionMenuControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (178808 => 178809)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2015-01-21 07:23:18 UTC (rev 178808)
+++ branches/safari-600.4-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2015-01-21 07:37:52 UTC (rev 178809)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)prepareForMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (menu != _wkView._actionMenu)
</del><ins>+ if (menu != _wkView.actionMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [_wkView _dismissContentRelativeChildWindows];
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)willOpenMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (menu != _wkView._actionMenu)
</del><ins>+ if (menu != _wkView.actionMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!menu.numberOfItems)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)didCloseMenu:(NSMenu *)menu withEvent:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if (menu != _wkView._actionMenu)
</del><ins>+ if (menu != _wkView.actionMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [self _clearActionMenuState];
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)menuNeedsUpdate:(NSMenu *)menu
</span><span class="cx"> {
</span><del>- if (menu != _wkView._actionMenu)
</del><ins>+ if (menu != _wkView.actionMenu)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(_state != ActionMenuState::None);
</span><span class="lines">@@ -749,7 +749,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateActionMenuItems
</span><span class="cx"> {
</span><del>- [_wkView._actionMenu removeAllItems];
</del><ins>+ [_wkView.actionMenu removeAllItems];
</ins><span class="cx">
</span><span class="cx"> NSArray *menuItems = [self _defaultMenuItems];
</span><span class="cx"> RefPtr<WebHitTestResult> hitTestResult = [self _webHitTestResult];
</span><span class="lines">@@ -760,10 +760,10 @@
</span><span class="cx"> menuItems = [_wkView _actionMenuItemsForHitTestResult:toAPI(hitTestResult.get()) withType:_type defaultActionMenuItems:menuItems userData:toAPI(_userData.get())];
</span><span class="cx">
</span><span class="cx"> for (NSMenuItem *item in menuItems)
</span><del>- [_wkView._actionMenu addItem:item];
</del><ins>+ [_wkView.actionMenu addItem:item];
</ins><span class="cx">
</span><del>- if (!_wkView._actionMenu.numberOfItems)
- [_wkView._actionMenu cancelTracking];
</del><ins>+ if (!_wkView.actionMenu.numberOfItems)
+ [_wkView.actionMenu cancelTracking];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="branchessafari6004branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/ChangeLog (178808 => 178809)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/ChangeLog 2015-01-21 07:23:18 UTC (rev 178808)
+++ branches/safari-600.4-branch/Tools/ChangeLog 2015-01-21 07:37:52 UTC (rev 178809)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Rollout r178679. rdar://problem/19448129
+
+2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r178679. rdar://problem/19448129
</span><span class="cx">
</span><span class="cx"> 2015-01-19 Timothy Horton <timothy_horton@apple.com>
</span></span></pre>
</div>
</div>
</body>
</html>