Title: [228246] trunk/Source/WebKit
Revision
228246
Author
[email protected]
Date
2018-02-07 15:13:49 -0800 (Wed, 07 Feb 2018)

Log Message

[Extra zoom mode] Delegate scrolling from the content view to input view controllers
https://bugs.webkit.org/show_bug.cgi?id=182534
<rdar://problem/37276625>

Reviewed by Tim Horton.

Override -_wheelChangedWithEvent: on the content view, and give extra zoomed input view controllers a chance to
handle the event.

* Platform/spi/ios/UIKitSPI.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _wheelChangedWithEvent:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (228245 => 228246)


--- trunk/Source/WebKit/ChangeLog	2018-02-07 23:07:02 UTC (rev 228245)
+++ trunk/Source/WebKit/ChangeLog	2018-02-07 23:13:49 UTC (rev 228246)
@@ -1,5 +1,20 @@
 2018-02-07  Wenson Hsieh  <[email protected]>
 
+        [Extra zoom mode] Delegate scrolling from the content view to input view controllers
+        https://bugs.webkit.org/show_bug.cgi?id=182534
+        <rdar://problem/37276625>
+
+        Reviewed by Tim Horton.
+
+        Override -_wheelChangedWithEvent: on the content view, and give extra zoomed input view controllers a chance to
+        handle the event.
+
+        * Platform/spi/ios/UIKitSPI.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _wheelChangedWithEvent:]):
+
+2018-02-07  Wenson Hsieh  <[email protected]>
+
         [Extra zoom mode] Implement multiple and single select menus
         https://bugs.webkit.org/show_bug.cgi?id=182525
         <rdar://problem/35143016>

Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (228245 => 228246)


--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2018-02-07 23:07:02 UTC (rev 228245)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h	2018-02-07 23:13:49 UTC (rev 228246)
@@ -307,6 +307,7 @@
 
 @interface UIResponder ()
 - (void)_handleKeyUIEvent:(UIEvent *)event;
+- (void)_wheelChangedWithEvent:(UIEvent *)event;
 @end
 
 @class CADisplay;

Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (228245 => 228246)


--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2018-02-07 23:07:02 UTC (rev 228245)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm	2018-02-07 23:13:49 UTC (rev 228246)
@@ -4359,6 +4359,24 @@
 
 #endif // ENABLE(EXTRA_ZOOM_MODE)
 
+- (void)_wheelChangedWithEvent:(UIEvent *)event
+{
+#if ENABLE(EXTRA_ZOOM_MODE)
+    if ([_numberPadViewController handleWheelEvent:event])
+        return;
+
+    if ([_textInputViewController handleWheelEvent:event])
+        return;
+
+    if ([_selectMenuViewController handleWheelEvent:event])
+        return;
+
+    if ([_focusedFormControlViewController handleWheelEvent:event])
+        return;
+#endif
+    [super _wheelChangedWithEvent:event];
+}
+
 - (void)_selectionChanged
 {
     _selectionNeedsUpdate = YES;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to