<!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>[181668] trunk/Source</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/181668">181668</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-03-17 15:48:07 -0700 (Tue, 17 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cannot invoke action menus anymore
https://bugs.webkit.org/show_bug.cgi?id=142797
<rdar://problem/20032670>
Reviewed by Beth Dakin.
* UIProcess/API/mac/WKView.mm:
Don't process mouse events that would make an action menu; call super
and let AppKit take care of it. We have to duplicate the macro so that
we can avoid calling super for the internal-only methods.
Also, otherMouseMoved is simply not a thing, so remove it.
* WebView/WebHTMLView.mm:
(-[WebHTMLView otherMouseDown:]):
Don't override otherMouseDown: if the event would make an action menu.
* platform/spi/mac/NSMenuSPI.h:
Add additional NSMenu SPI.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformspimacNSMenuSPIh">trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181667 => 181668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-17 22:20:30 UTC (rev 181667)
+++ trunk/Source/WebCore/ChangeLog 2015-03-17 22:48:07 UTC (rev 181668)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-17 Tim Horton <timothy_horton@apple.com>
+
+ Cannot invoke action menus anymore
+ https://bugs.webkit.org/show_bug.cgi?id=142797
+ <rdar://problem/20032670>
+
+ Reviewed by Beth Dakin.
+
+ * platform/spi/mac/NSMenuSPI.h:
+ Add additional NSMenu SPI.
+
</ins><span class="cx"> 2015-03-17 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Split fragments on renderer boundary on the fly.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspimacNSMenuSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h (181667 => 181668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2015-03-17 22:20:30 UTC (rev 181667)
+++ trunk/Source/WebCore/platform/spi/mac/NSMenuSPI.h 2015-03-17 22:48:07 UTC (rev 181668)
</span><span class="lines">@@ -27,6 +27,16 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: We should just include the appropriate internal headers.
</span><span class="cx">
</span><ins>+typedef NS_ENUM(NSInteger, NSMenuType) {
+ NSMenuTypeNone = 0,
+ NSMenuTypeContextMenu,
+ NSMenuTypeActionMenu,
+};
+
+@interface NSMenu (Private)
++ (NSMenuType)menuTypeForEvent:(NSEvent *)event;
+@end
+
</ins><span class="cx"> @interface NSMenuItem (Private)
</span><span class="cx"> + (QLPreviewMenuItem *)standardQuickLookMenuItem;
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (181667 => 181668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-03-17 22:20:30 UTC (rev 181667)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-03-17 22:48:07 UTC (rev 181668)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-03-17 Tim Horton <timothy_horton@apple.com>
+
+ Cannot invoke action menus anymore
+ https://bugs.webkit.org/show_bug.cgi?id=142797
+ <rdar://problem/20032670>
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView otherMouseDown:]):
+ Don't override otherMouseDown: if the event would make an action menu.
+
</ins><span class="cx"> 2015-03-16 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Enable ES6 classes by default
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (181667 => 181668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-03-17 22:20:30 UTC (rev 181667)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-03-17 22:48:07 UTC (rev 181668)
</span><span class="lines">@@ -106,6 +106,7 @@
</span><span class="cx"> #import <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #import <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><ins>+#import <WebCore/NSMenuSPI.h>
</ins><span class="cx"> #import <WebCore/NSURLFileTypeMappingsSPI.h>
</span><span class="cx"> #import <WebCore/Page.h>
</span><span class="cx"> #import <WebCore/Range.h>
</span><span class="lines">@@ -5387,10 +5388,12 @@
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> - (void)otherMouseDown:(NSEvent *)event
</span><span class="cx"> {
</span><del>- if ([event buttonNumber] == 2)
- [self mouseDown:event];
- else
</del><ins>+ if ([event buttonNumber] != 2 || [NSMenu menuTypeForEvent:event] == NSMenuTypeActionMenu) {
</ins><span class="cx"> [super otherMouseDown:event];
</span><ins>+ return;
+ }
+
+ [self mouseDown:event];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)otherMouseDragged:(NSEvent *)event
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181667 => 181668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-17 22:20:30 UTC (rev 181667)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-17 22:48:07 UTC (rev 181668)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-17 Tim Horton <timothy_horton@apple.com>
+
+ Cannot invoke action menus anymore
+ https://bugs.webkit.org/show_bug.cgi?id=142797
+ <rdar://problem/20032670>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/API/mac/WKView.mm:
+ Don't process mouse events that would make an action menu; call super
+ and let AppKit take care of it. We have to duplicate the macro so that
+ we can avoid calling super for the internal-only methods.
+ Also, otherMouseMoved is simply not a thing, so remove it.
+
</ins><span class="cx"> 2015-03-17 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> DOM mouse events have weird timing for force clickable elements in Safari 8.0.3 on
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (181667 => 181668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-17 22:20:30 UTC (rev 181667)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-03-17 22:48:07 UTC (rev 181668)
</span><span class="lines">@@ -91,6 +91,7 @@
</span><span class="cx"> #import <WebCore/LocalizedStrings.h>
</span><span class="cx"> #import <WebCore/LookupSPI.h>
</span><span class="cx"> #import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
</span><ins>+#import <WebCore/NSMenuSPI.h>
</ins><span class="cx"> #import <WebCore/NSViewSPI.h>
</span><span class="cx"> #import <WebCore/PlatformEventFactoryMac.h>
</span><span class="cx"> #import <WebCore/PlatformScreen.h>
</span><span class="lines">@@ -1176,9 +1177,32 @@
</span><span class="cx"> }]; \
</span><span class="cx"> return; \
</span><span class="cx"> } \
</span><ins>+ if ([NSMenu menuTypeForEvent:theEvent] == NSMenuTypeActionMenu) { \
+ [super Selector:theEvent]; \
+ return; \
+ } \
</ins><span class="cx"> NativeWebMouseEvent webEvent(theEvent, self); \
</span><span class="cx"> _data->_page->handleMouseEvent(webEvent); \
</span><span class="cx"> }
</span><ins>+#define NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(Selector) \
+ - (void)Selector:(NSEvent *)theEvent \
+ { \
+ if (_data->_ignoresNonWheelEvents) \
+ return; \
+ if (NSTextInputContext *context = [self inputContext]) { \
+ [context handleEvent:theEvent completionHandler:^(BOOL handled) { \
+ if (handled) \
+ LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
+ else { \
+ NativeWebMouseEvent webEvent(theEvent, self); \
+ _data->_page->handleMouseEvent(webEvent); \
+ } \
+ }]; \
+ return; \
+ } \
+ NativeWebMouseEvent webEvent(theEvent, self); \
+ _data->_page->handleMouseEvent(webEvent); \
+ }
</ins><span class="cx"> #else
</span><span class="cx"> #define NATIVE_MOUSE_EVENT_HANDLER(Selector) \
</span><span class="cx"> - (void)Selector:(NSEvent *)theEvent \
</span><span class="lines">@@ -1189,25 +1213,41 @@
</span><span class="cx"> LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
</span><span class="cx"> return; \
</span><span class="cx"> } \
</span><ins>+ if ([NSMenu menuTypeForEvent:theEvent] == NSMenuTypeActionMenu) { \
+ [super Selector:theEvent]; \
+ return; \
+ } \
</ins><span class="cx"> NativeWebMouseEvent webEvent(theEvent, self); \
</span><span class="cx"> _data->_page->handleMouseEvent(webEvent); \
</span><span class="cx"> }
</span><ins>+#define NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(Selector) \
+ - (void)Selector:(NSEvent *)theEvent \
+ { \
+ if (_data->_ignoresNonWheelEvents) \
+ return; \
+ if ([[self inputContext] handleEvent:theEvent]) { \
+ LOG(TextInput, "%s was handled by text input context", String(#Selector).substring(0, String(#Selector).find("Internal")).ascii().data()); \
+ return; \
+ } \
+ NativeWebMouseEvent webEvent(theEvent, self); \
+ _data->_page->handleMouseEvent(webEvent); \
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(mouseEntered)
</span><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(mouseExited)
</span><del>-NATIVE_MOUSE_EVENT_HANDLER(mouseMovedInternal)
-NATIVE_MOUSE_EVENT_HANDLER(mouseDownInternal)
-NATIVE_MOUSE_EVENT_HANDLER(mouseUpInternal)
-NATIVE_MOUSE_EVENT_HANDLER(mouseDraggedInternal)
</del><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(otherMouseDown)
</span><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(otherMouseDragged)
</span><del>-NATIVE_MOUSE_EVENT_HANDLER(otherMouseMoved)
</del><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(otherMouseUp)
</span><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(rightMouseDown)
</span><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(rightMouseDragged)
</span><span class="cx"> NATIVE_MOUSE_EVENT_HANDLER(rightMouseUp)
</span><span class="cx">
</span><ins>+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseMovedInternal)
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseDownInternal)
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseUpInternal)
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseDraggedInternal)
+
</ins><span class="cx"> #undef NATIVE_MOUSE_EVENT_HANDLER
</span><span class="cx">
</span><span class="cx"> - (void)_ensureGestureController
</span></span></pre>
</div>
</div>
</body>
</html>