Title: [264422] trunk/Source/WebCore
- Revision
- 264422
- Author
- [email protected]
- Date
- 2020-07-15 14:31:00 -0700 (Wed, 15 Jul 2020)
Log Message
Flip the sense of the return value for processWheelEventForScrollSnap()
https://bugs.webkit.org/show_bug.cgi?id=214328
Reviewed by Wenson Hsieh.
All the other functions return "true" to mean "handled". Make this one the same.
* platform/cocoa/ScrollController.mm:
(WebCore::ScrollController::handleWheelEvent):
(WebCore::ScrollController::processWheelEventForScrollSnap):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (264421 => 264422)
--- trunk/Source/WebCore/ChangeLog 2020-07-15 21:18:02 UTC (rev 264421)
+++ trunk/Source/WebCore/ChangeLog 2020-07-15 21:31:00 UTC (rev 264422)
@@ -1,3 +1,16 @@
+2020-07-15 Simon Fraser <[email protected]>
+
+ Flip the sense of the return value for processWheelEventForScrollSnap()
+ https://bugs.webkit.org/show_bug.cgi?id=214328
+
+ Reviewed by Wenson Hsieh.
+
+ All the other functions return "true" to mean "handled". Make this one the same.
+
+ * platform/cocoa/ScrollController.mm:
+ (WebCore::ScrollController::handleWheelEvent):
+ (WebCore::ScrollController::processWheelEventForScrollSnap):
+
2020-07-15 Devin Rousso <[email protected]>
should represent `TextPlaceholderElement` as an `NSTextAttachmentCharacter` instead of a `\n`
Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (264421 => 264422)
--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2020-07-15 21:18:02 UTC (rev 264421)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2020-07-15 21:31:00 UTC (rev 264422)
@@ -129,7 +129,7 @@
bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
{
#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
- if (!m_scrollController.processWheelEventForScrollSnap(e))
+ if (m_scrollController.processWheelEventForScrollSnap(e))
return false;
#endif
#if PLATFORM(COCOA)
Modified: trunk/Source/WebCore/platform/cocoa/ScrollController.mm (264421 => 264422)
--- trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2020-07-15 21:18:02 UTC (rev 264421)
+++ trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2020-07-15 21:31:00 UTC (rev 264422)
@@ -120,8 +120,8 @@
bool ScrollController::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
{
#if ENABLE(CSS_SCROLL_SNAP)
- if (!processWheelEventForScrollSnap(wheelEvent))
- return false;
+ if (processWheelEventForScrollSnap(wheelEvent))
+ return false; // FIXME: Why don't we report that we handled it?
#endif
if (wheelEvent.phase() == PlatformWheelEventPhaseMayBegin || wheelEvent.phase() == PlatformWheelEventPhaseCancelled)
return false;
@@ -665,10 +665,10 @@
bool ScrollController::processWheelEventForScrollSnap(const PlatformWheelEvent& wheelEvent)
{
if (!usesScrollSnap())
- return true;
+ return false;
if (m_scrollSnapState->snapOffsetsForAxis(ScrollEventAxis::Horizontal).isEmpty() && m_scrollSnapState->snapOffsetsForAxis(ScrollEventAxis::Vertical).isEmpty())
- return true;
+ return false;
auto status = toWheelEventStatus(wheelEvent.phase(), wheelEvent.momentumPhase());
@@ -704,7 +704,7 @@
break;
}
- return !(isMomentumScrolling && shouldOverrideMomentumScrolling());
+ return isMomentumScrolling && shouldOverrideMomentumScrolling();
}
void ScrollController::updateGestureInProgressState(const PlatformWheelEvent& wheelEvent)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
