Changeset 185679 in webkit

Timestamp:

Jun 17, 2015, 5:03:42 PM (11 years ago)

Author:

timothy_horton@apple.com

Message:

Swipe gesture can get stuck, preventing scrolling and other gestures
​https://bugs.webkit.org/show_bug.cgi?id=146088
<rdar://problem/16056087>

Reviewed by Darin Adler.

• UIProcess/mac/ViewGestureControllerMac.mm:

(WebKit::ViewGestureController::trackSwipeGesture):
Ignore mouse events that come in while we're doing a swipe.
This prevents potentially problematic mouse events (especially context menus)
won't be processed during a swipe, avoiding situations that can cause
the swipe gesture to get stuck.

• WebCore.xcodeproj/project.pbxproj:
• platform/spi/mac/NSEventSPI.h: Added.

Add an SPI header.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• WebCore/platform/spi/mac/NSEventSPI.h (added)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/mac/ViewGestureControllerMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-17  Tim Horton  <timothy_horton@apple.com>
+
+        Swipe gesture can get stuck, preventing scrolling and other gestures
+        https://bugs.webkit.org/show_bug.cgi?id=146088
+        <rdar://problem/16056087>
+
+        Reviewed by Darin Adler.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * platform/spi/mac/NSEventSPI.h: Added.
+        Add an SPI header.
+
 2015-06-16  Matt Rajca  <mrajca@apple.com>
 

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1146 +1146 @@
                 2D9A247615B9C2F400D34527 /* DOMDOMSecurityPolicy.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 2D9A247015B9C29500D34527 /* DOMDOMSecurityPolicy.h */; };
                 2D9F0E1314FF1CBF00BA0FF7 /* linearSRGB.icc in Resources */ = {isa = PBXBuildFile; fileRef = 2D9F0E1214FF1CBF00BA0FF7 /* linearSRGB.icc */; };
+                2DB9C4AA1B3231F40070F27F /* NSEventSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB9C4A91B3231F40070F27F /* NSEventSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 2DCB837919F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DCB837719F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 2DCB837A19F99BBA00A7FBE4 /* NSSharingServiceSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DCB837819F99BBA00A7FBE4 /* NSSharingServiceSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -8298 +8299 @@
                 2DAAE32C19DCAF6000E002D2 /* MockPageOverlayClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MockPageOverlayClient.cpp; sourceTree = "<group>"; };
                 2DAAE32D19DCAF6000E002D2 /* MockPageOverlayClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MockPageOverlayClient.h; sourceTree = "<group>"; };
+                2DB9C4A91B3231F40070F27F /* NSEventSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSEventSPI.h; sourceTree = "<group>"; };
                 2DCB837719F99BBA00A7FBE4 /* NSSharingServicePickerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSSharingServicePickerSPI.h; sourceTree = "<group>"; };
                 2DCB837819F99BBA00A7FBE4 /* NSSharingServiceSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSSharingServiceSPI.h; sourceTree = "<group>"; };
@@ -17971 +17973 @@
                                 2D59F1BE1A0044C6001F3D29 /* DataDetectorsSPI.h */,
                                 2D413F601A187A3F0041A521 /* LookupSPI.h */,
+                                2DB9C4A91B3231F40070F27F /* NSEventSPI.h */,
                                 1C6466271A12C3F90094603C /* NSFontSPI.h */,
                                 9321D58F1A3906FA008052BE /* NSImmediateActionGestureRecognizerSPI.h */,
@@ -24365 +24368 @@
                                 85E711920AC5D5350053270F /* DOMCSSRuleListInternal.h in Headers */,
                                 85032DE50AA8C9BE007D3B7D /* DOMCSSStyleDeclaration.h in Headers */,
+                                2DB9C4AA1B3231F40070F27F /* NSEventSPI.h in Headers */,
                                 85E711930AC5D5350053270F /* DOMCSSStyleDeclarationInternal.h in Headers */,
                                 85032DE70AA8C9BE007D3B7D /* DOMCSSStyleRule.h in Headers */,

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-17  Tim Horton  <timothy_horton@apple.com>
+
+        Swipe gesture can get stuck, preventing scrolling and other gestures
+        https://bugs.webkit.org/show_bug.cgi?id=146088
+        <rdar://problem/16056087>
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/mac/ViewGestureControllerMac.mm:
+        (WebKit::ViewGestureController::trackSwipeGesture):
+        Ignore mouse events that come in while we're doing a swipe.
+        This prevents potentially problematic mouse events (especially context menus)
+        won't be processed during a swipe, avoiding situations that can cause
+        the swipe gesture to get stuck.
+
 2015-06-17  Sungmann Cho  <sungmann.cho@navercorp.com>
 

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

@@ -42 +42 @@
 #import <Cocoa/Cocoa.h>
 #import <WebCore/IOSurface.h>
+#import <WebCore/NSEventSPI.h>
 #import <WebCore/QuartzCoreSPI.h>
 #import <WebCore/WebActionDisablingCALayerDelegate.h>
@@ -408 +409 @@
     m_swipeCancellationTracker = swipeCancellationTracker;
 
-    [event trackSwipeEventWithOptions:0 dampenAmountThresholdMin:minProgress max:maxProgress usingHandler:^(CGFloat progress, NSEventPhase phase, BOOL isComplete, BOOL *stop) {
+    [event trackSwipeEventWithOptions:NSEventSwipeTrackingConsumeMouseEvents dampenAmountThresholdMin:minProgress max:maxProgress usingHandler:^(CGFloat progress, NSEventPhase phase, BOOL isComplete, BOOL *stop) {
         if ([swipeCancellationTracker isCancelled]) {
             *stop = YES;