Changeset 175635 in webkit

Timestamp:

Nov 5, 2014 12:48:37 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Disable action menus on page previews
​https://bugs.webkit.org/show_bug.cgi?id=138431

Patch by Conrad Shultz <Conrad Shultz> on 2014-11-05
Reviewed by Anders Carlsson.

• UIProcess/API/mac/WKView.mm:

(-[WKView _shouldIgnoreMouseEvents]):
Renamed from -shouldIgnoreMouseEvents since this isn't actually public.
(-[WKView swipeWithEvent:]):
(-[WKView mouseMoved:]):
(-[WKView mouseDown:]):
(-[WKView mouseUp:]):
(-[WKView mouseDragged:]):
Updated to reflect method rename.
(-[WKView shouldIgnoreMouseEvents]): Deleted.

• UIProcess/API/mac/WKViewInternal.h:

Expose -_shouldIgnoreMouseEvents.

• UIProcess/mac/WKActionMenuController.mm:

(-[WKActionMenuController prepareForMenu:withEvent:]):
Cancel the menu if the presenting WKView should ignore mouse events.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (8 diffs)
• UIProcess/API/mac/WKViewInternal.h (modified) (1 diff)
• UIProcess/mac/WKActionMenuController.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-05  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Disable action menus on page previews
+        https://bugs.webkit.org/show_bug.cgi?id=138431
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _shouldIgnoreMouseEvents]):
+        Renamed from -shouldIgnoreMouseEvents since this isn't actually public.
+        (-[WKView swipeWithEvent:]):
+        (-[WKView mouseMoved:]):
+        (-[WKView mouseDown:]):
+        (-[WKView mouseUp:]):
+        (-[WKView mouseDragged:]):
+        Updated to reflect method rename.
+        (-[WKView shouldIgnoreMouseEvents]): Deleted.
+
+        * UIProcess/API/mac/WKViewInternal.h:
+        Expose -_shouldIgnoreMouseEvents.
+
+        * UIProcess/mac/WKActionMenuController.mm:
+        (-[WKActionMenuController prepareForMenu:withEvent:]):
+        Cancel the menu if the presenting WKView should ignore mouse events.
+
 2014-11-05  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -1097 +1097 @@
 // Events
 
-- (BOOL)shouldIgnoreMouseEvents
+- (BOOL)_shouldIgnoreMouseEvents
 {
     // FIXME: This check is surprisingly specific. Are there any other cases where we need to block mouse events?
@@ -1152 +1152 @@
     - (void)Selector:(NSEvent *)theEvent \
     { \
-        if ([self shouldIgnoreMouseEvents]) \
+        if (self._shouldIgnoreMouseEvents) \
             return; \
         if (NSTextInputContext *context = [self inputContext]) { \
@@ -1172 +1172 @@
     - (void)Selector:(NSEvent *)theEvent \
     { \
-        if ([self shouldIgnoreMouseEvents]) \
+        if (self._shouldIgnoreMouseEvents) \
             return; \
         if ([[self inputContext] handleEvent:theEvent]) { \
@@ -1224 +1224 @@
 - (void)swipeWithEvent:(NSEvent *)event
 {
-    if ([self shouldIgnoreMouseEvents])
+    if (self._shouldIgnoreMouseEvents)
         return;
 
@@ -1242 +1242 @@
 - (void)mouseMoved:(NSEvent *)event
 {
-    if ([self shouldIgnoreMouseEvents])
+    if (self._shouldIgnoreMouseEvents)
         return;
 
@@ -1254 +1254 @@
 - (void)mouseDown:(NSEvent *)event
 {
-    if ([self shouldIgnoreMouseEvents])
+    if (self._shouldIgnoreMouseEvents)
         return;
 
@@ -1264 +1264 @@
 - (void)mouseUp:(NSEvent *)event
 {
-    if ([self shouldIgnoreMouseEvents])
+    if (self._shouldIgnoreMouseEvents)
         return;
 
@@ -1273 +1273 @@
 - (void)mouseDragged:(NSEvent *)event
 {
-    if ([self shouldIgnoreMouseEvents])
+    if (self._shouldIgnoreMouseEvents)
         return;
 

trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

@@ -110 +110 @@
 - (BOOL)_suppressVisibilityUpdates;
 
+- (BOOL)_shouldIgnoreMouseEvents;
+
 - (void)_didFirstVisuallyNonEmptyLayoutForMainFrame;
 - (void)_didFinishLoadForMainFrame;

trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm

@@ -142 +142 @@
         return;
 
+    if (_wkView._shouldIgnoreMouseEvents) {
+        [menu cancelTracking];
+        return;
+    }
+
     _page->performActionMenuHitTestAtLocation([_wkView convertPoint:event.locationInWindow fromView:nil]);