Changeset 181741 in webkit

Timestamp:

Mar 19, 2015, 1:57:43 AM (11 years ago)

Author:

bshafiei@apple.com

Message:

Merged r181668. rdar://problem/20032670

Location:

tags/Safari-601.1.23.3/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/spi/mac/NSMenuSPI.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/API/mac/WKView.mm (modified) (3 diffs)

tags/Safari-601.1.23.3/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r181668.
+
+    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.
+
 2015-03-19  Babak Shafiei  <bshafiei@apple.com>
 

tags/Safari-601.1.23.3/Source/WebCore/platform/spi/mac/NSMenuSPI.h

@@ -28 +28 @@
 // FIXME: We should just include the appropriate internal headers.
 
+typedef NS_ENUM(NSInteger, NSMenuType) {
+    NSMenuTypeNone = 0,
+    NSMenuTypeContextMenu,
+    NSMenuTypeActionMenu,
+};
+
+@interface NSMenu (Private)
++ (NSMenuType)menuTypeForEvent:(NSEvent *)event;
+@end
+
 @interface NSMenuItem (Private)
 + (QLPreviewMenuItem *)standardQuickLookMenuItem;

tags/Safari-601.1.23.3/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2015-03-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r181668.
+
+    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.
+
 2015-03-14  Dean Jackson  <dino@apple.com>
 

tags/Safari-601.1.23.3/Source/WebKit/mac/WebView/WebHTMLView.mm

@@ -107 +107 @@
 #import <WebCore/MIMETypeRegistry.h>
 #import <WebCore/MainFrame.h>
+#import <WebCore/NSMenuSPI.h>
 #import <WebCore/NSURLFileTypeMappingsSPI.h>
 #import <WebCore/Page.h>
@@ -5388 +5389 @@
 - (void)otherMouseDown:(NSEvent *)event
 {
-    if ([event buttonNumber] == 2)
-        [self mouseDown:event];
-    else
+    if ([event buttonNumber] != 2 || [NSMenu menuTypeForEvent:event] == NSMenuTypeActionMenu) {
         [super otherMouseDown:event];
+        return;
+    }
+
+    [self mouseDown:event];
 }
 

tags/Safari-601.1.23.3/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-19  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r181668.
+
+    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.
+
 2015-03-16  Przemyslaw Piorkowski  <p.piorkowski@samsung.com>
 

tags/Safari-601.1.23.3/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -92 +92 @@
 #import <WebCore/LookupSPI.h>
 #import <WebCore/NSImmediateActionGestureRecognizerSPI.h>
+#import <WebCore/NSMenuSPI.h>
 #import <WebCore/NSViewSPI.h>
 #import <WebCore/PlatformEventFactoryMac.h>
@@ -1177 +1178 @@
             return; \
         } \
+        if ([NSMenu menuTypeForEvent:theEvent] == NSMenuTypeActionMenu) { \
+            [super Selector:theEvent]; \
+            return; \
+        } \
+        NativeWebMouseEvent webEvent(theEvent, self); \
+        _data->_page->handleMouseEvent(webEvent); \
+    }
+#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); \
@@ -1190 +1214 @@
             return; \
         } \
+        if ([NSMenu menuTypeForEvent:theEvent] == NSMenuTypeActionMenu) { \
+            [super Selector:theEvent]; \
+            return; \
+        } \
         NativeWebMouseEvent webEvent(theEvent, self); \
         _data->_page->handleMouseEvent(webEvent); \
     }
+#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); \
+    }
 #endif
 
 NATIVE_MOUSE_EVENT_HANDLER(mouseEntered)
 NATIVE_MOUSE_EVENT_HANDLER(mouseExited)
-NATIVE_MOUSE_EVENT_HANDLER(mouseMovedInternal)
-NATIVE_MOUSE_EVENT_HANDLER(mouseDownInternal)
-NATIVE_MOUSE_EVENT_HANDLER(mouseUpInternal)
-NATIVE_MOUSE_EVENT_HANDLER(mouseDraggedInternal)
 NATIVE_MOUSE_EVENT_HANDLER(otherMouseDown)
 NATIVE_MOUSE_EVENT_HANDLER(otherMouseDragged)
-NATIVE_MOUSE_EVENT_HANDLER(otherMouseMoved)
 NATIVE_MOUSE_EVENT_HANDLER(otherMouseUp)
 NATIVE_MOUSE_EVENT_HANDLER(rightMouseDown)
 NATIVE_MOUSE_EVENT_HANDLER(rightMouseDragged)
 NATIVE_MOUSE_EVENT_HANDLER(rightMouseUp)
+
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseMovedInternal)
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseDownInternal)
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseUpInternal)
+NATIVE_MOUSE_EVENT_HANDLER_INTERNAL(mouseDraggedInternal)
 
 #undef NATIVE_MOUSE_EVENT_HANDLER