Title: [259969] releases/WebKitGTK/webkit-2.28/Source
- Revision
- 259969
- Author
- carlo...@webkit.org
- Date
- 2020-04-12 06:16:54 -0700 (Sun, 12 Apr 2020)
Log Message
Merge r258831 - [WPE] AsyncScrolling: horizontal scrolling is inverted
https://bugs.webkit.org/show_bug.cgi?id=208638
Source/WebCore:
Patch by Carlos Garcia Campos <cgar...@igalia.com> on 2020-03-23
Reviewed by Adrian Perez de Castro.
Scrolling down should scroll to the right and up to the left..
* page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp:
(WebCore::ScrollingTreeFrameScrollingNodeNicosia::handleWheelEvent): Invert also the x axis.
* page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp:
(WebCore::ScrollingTreeOverflowScrollingNodeNicosia::handleWheelEvent): Ditto.
Source/WebKit:
Patch by Chris Lord <cl...@igalia.com> on 2020-03-23
Reviewed by Adrian Perez de Castro.
* UIProcess/API/wpe/ScrollGestureController.cpp:
(WebKit::ScrollGestureController::handleEvent):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (259968 => 259969)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-04-12 13:16:47 UTC (rev 259968)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-04-12 13:16:54 UTC (rev 259969)
@@ -1,3 +1,17 @@
+2020-03-23 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [WPE] AsyncScrolling: horizontal scrolling is inverted
+ https://bugs.webkit.org/show_bug.cgi?id=208638
+
+ Reviewed by Adrian Perez de Castro.
+
+ Scrolling down should scroll to the right and up to the left..
+
+ * page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp:
+ (WebCore::ScrollingTreeFrameScrollingNodeNicosia::handleWheelEvent): Invert also the x axis.
+ * page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp:
+ (WebCore::ScrollingTreeOverflowScrollingNodeNicosia::handleWheelEvent): Ditto.
+
2020-03-26 Charlie Turner <ctur...@igalia.com>
[GStreamer] Fix missing NULL-check in setSyncOnClock
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp (259968 => 259969)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp 2020-04-12 13:16:47 UTC (rev 259968)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp 2020-04-12 13:16:54 UTC (rev 259969)
@@ -107,7 +107,7 @@
auto& compositionLayer = downcast<Nicosia::CompositionLayer>(*scrollLayer);
auto updateScope = compositionLayer.createUpdateScope();
- scrollBy({ wheelEvent.deltaX(), -wheelEvent.deltaY() });
+ scrollBy({ -wheelEvent.deltaX(), -wheelEvent.deltaY() });
}
scrollingTree().setOrClearLatchedNode(wheelEvent, scrollingNodeID());
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp (259968 => 259969)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp 2020-04-12 13:16:47 UTC (rev 259968)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp 2020-04-12 13:16:54 UTC (rev 259969)
@@ -93,7 +93,7 @@
auto& compositionLayer = downcast<Nicosia::CompositionLayer>(*scrollLayer);
auto updateScope = compositionLayer.createUpdateScope();
- scrollBy({ wheelEvent.deltaX(), -wheelEvent.deltaY() });
+ scrollBy({ -wheelEvent.deltaX(), -wheelEvent.deltaY() });
}
scrollingTree().setOrClearLatchedNode(wheelEvent, scrollingNodeID());
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog (259968 => 259969)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-04-12 13:16:47 UTC (rev 259968)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/ChangeLog 2020-04-12 13:16:54 UTC (rev 259969)
@@ -1,3 +1,13 @@
+2020-03-23 Chris Lord <cl...@igalia.com>
+
+ [WPE] AsyncScrolling: horizontal scrolling is inverted
+ https://bugs.webkit.org/show_bug.cgi?id=208638
+
+ Reviewed by Adrian Perez de Castro.
+
+ * UIProcess/API/wpe/ScrollGestureController.cpp:
+ (WebKit::ScrollGestureController::handleEvent):
+
2020-04-03 Adrian Perez de Castro <ape...@igalia.com>
Unreviewed fix after r259382
Modified: releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.cpp (259968 => 259969)
--- releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.cpp 2020-04-12 13:16:47 UTC (rev 259968)
+++ releases/WebKitGTK/webkit-2.28/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.cpp 2020-04-12 13:16:54 UTC (rev 259969)
@@ -58,7 +58,7 @@
touchPoint->time, m_start.x, m_start.y,
0, 0, 0,
};
- m_axisEvent.x_axis = m_offset.x - touchPoint->x;
+ m_axisEvent.x_axis = -(m_offset.x - touchPoint->x);
m_axisEvent.y_axis = -(m_offset.y - touchPoint->y);
#else
m_axisEvent = {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
