Title: [270754] trunk/Source/WebKit
- Revision
- 270754
- Author
- [email protected]
- Date
- 2020-12-13 16:58:57 -0800 (Sun, 13 Dec 2020)
Log Message
Fix the watchOS build after r270712
<rdar://problem/72265227>
* Shared/ios/WebIOSEventFactory.h:
* Shared/ios/WebIOSEventFactory.mm:
(WebIOSEventFactory::createWebWheelEvent):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (270753 => 270754)
--- trunk/Source/WebKit/ChangeLog 2020-12-13 23:59:24 UTC (rev 270753)
+++ trunk/Source/WebKit/ChangeLog 2020-12-14 00:58:57 UTC (rev 270754)
@@ -1,3 +1,12 @@
+2020-12-13 Tim Horton <[email protected]>
+
+ Fix the watchOS build after r270712
+ <rdar://problem/72265227>
+
+ * Shared/ios/WebIOSEventFactory.h:
+ * Shared/ios/WebIOSEventFactory.mm:
+ (WebIOSEventFactory::createWebWheelEvent):
+
2020-12-12 Jiewen Tan <[email protected]>
[WebAuthn][iOS] Turn on modern WebAuthn for default browsers
Modified: trunk/Source/WebKit/Shared/ios/WebIOSEventFactory.h (270753 => 270754)
--- trunk/Source/WebKit/Shared/ios/WebIOSEventFactory.h 2020-12-13 23:59:24 UTC (rev 270753)
+++ trunk/Source/WebKit/Shared/ios/WebIOSEventFactory.h 2020-12-14 00:58:57 UTC (rev 270754)
@@ -39,7 +39,10 @@
public:
static WebKit::WebKeyboardEvent createWebKeyboardEvent(::WebEvent *, bool handledByInputMethod);
static WebKit::WebMouseEvent createWebMouseEvent(::WebEvent *);
+
+#if HAVE(UISCROLLVIEW_ASYNCHRONOUS_SCROLL_EVENT_HANDLING)
static WebKit::WebWheelEvent createWebWheelEvent(UIScrollEvent *, UIView *contentView);
+#endif
static UIKeyModifierFlags toUIKeyModifierFlags(OptionSet<WebKit::WebEvent::Modifier>);
};
Modified: trunk/Source/WebKit/Shared/ios/WebIOSEventFactory.mm (270753 => 270754)
--- trunk/Source/WebKit/Shared/ios/WebIOSEventFactory.mm 2020-12-13 23:59:24 UTC (rev 270753)
+++ trunk/Source/WebKit/Shared/ios/WebIOSEventFactory.mm 2020-12-14 00:58:57 UTC (rev 270754)
@@ -152,15 +152,12 @@
}
}
+#if HAVE(UISCROLLVIEW_ASYNCHRONOUS_SCROLL_EVENT_HANDLING)
WebKit::WebWheelEvent WebIOSEventFactory::createWebWheelEvent(UIScrollEvent *event, UIView *contentView)
{
WebCore::IntPoint scrollLocation = WebCore::roundedIntPoint([event locationInView:contentView]);
-#if HAVE(UISCROLLVIEW_ASYNCHRONOUS_SCROLL_EVENT_HANDLING)
CGVector deltaVector = [event _adjustedAcceleratedDeltaInView:contentView];
WebCore::FloatSize delta(deltaVector.dx, deltaVector.dy);
-#else
- WebCore::FloatSize delta;
-#endif
return {
WebKit::WebEvent::Wheel,
@@ -179,5 +176,6 @@
MonotonicTime::fromRawSeconds(event.timestamp).approximateWallTime()
};
}
+#endif
#endif // PLATFORM(IOS_FAMILY)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
