Diff
Modified: trunk/Source/WebCore/ChangeLog (294208 => 294209)
--- trunk/Source/WebCore/ChangeLog 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/ChangeLog 2022-05-14 20:08:58 UTC (rev 294209)
@@ -1,3 +1,34 @@
+2022-05-10 Yusuke Suzuki <ysuz...@apple.com>
+
+ Rename EventTrackingRegions::Event to EventTrackingRegions::EventType
+ https://bugs.webkit.org/show_bug.cgi?id=240295
+
+ Reviewed by Darin Adler.
+
+ This patch is follow-up after r293967 by Darin's comment. EventTrackingRegions::Event is not event actually,
+ it is just an EventType. This patch renames it with EventType. We also rename variables "event" to "eventType".
+
+ * page/DebugPageOverlays.cpp:
+ (WebCore::NonFastScrollableRegionOverlay::drawRect):
+ * page/Page.cpp:
+ (WebCore::Page::touchEventRectsForEventForTesting):
+ * page/Page.h:
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::absoluteEventTrackingRegionsForFrame const):
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::computeWheelProcessingSteps):
+ (WebCore::ScrollingTree::eventTrackingTypeForPoint):
+ * page/scrolling/ScrollingTree.h:
+ * platform/EventTrackingRegions.cpp:
+ (WebCore::EventTrackingRegions::eventName):
+ (WebCore::EventTrackingRegions::eventNameAtomString): We add this function to have a way to get AtomString event name.
+ It simplifies Internal code.
+ (WebCore::EventTrackingRegions::trackingTypeForPoint):
+ (WebCore::EventTrackingRegions::uniteSynchronousRegion):
+ * platform/EventTrackingRegions.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::touchEventRectsForEvent):
+
2022-05-14 Tyler Wilcock <tyle...@apple.com>
AX: Remove CSSDisplayContentsAXSupportEnabled flag
Modified: trunk/Source/WebCore/page/DebugPageOverlays.cpp (294208 => 294209)
--- trunk/Source/WebCore/page/DebugPageOverlays.cpp 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/page/DebugPageOverlays.cpp 2022-05-14 20:08:58 UTC (rev 294209)
@@ -177,15 +177,15 @@
void NonFastScrollableRegionOverlay::drawRect(PageOverlay& pageOverlay, GraphicsContext& context, const IntRect&)
{
- static constexpr std::pair<EventTrackingRegions::Event, SRGBA<uint8_t>> colorMappings[] = {
- { EventTrackingRegions::Event::Mousedown, { 80, 245, 80, 50 } },
- { EventTrackingRegions::Event::Mousemove, { 245, 245, 80, 50 } },
- { EventTrackingRegions::Event::Mouseup, { 80, 245, 176, 50 } },
- { EventTrackingRegions::Event::Touchend, { 191, 63, 127, 50 } },
- { EventTrackingRegions::Event::Touchforcechange, { 63, 63, 191, 50 } },
- { EventTrackingRegions::Event::Touchmove, { 80, 204, 245, 50 } },
- { EventTrackingRegions::Event::Touchstart, { 191, 191, 63, 50 } },
- { EventTrackingRegions::Event::Wheel, { 255, 128, 0, 50 } },
+ static constexpr std::pair<EventTrackingRegions::EventType, SRGBA<uint8_t>> colorMappings[] = {
+ { EventTrackingRegions::EventType::Mousedown, { 80, 245, 80, 50 } },
+ { EventTrackingRegions::EventType::Mousemove, { 245, 245, 80, 50 } },
+ { EventTrackingRegions::EventType::Mouseup, { 80, 245, 176, 50 } },
+ { EventTrackingRegions::EventType::Touchend, { 191, 63, 127, 50 } },
+ { EventTrackingRegions::EventType::Touchforcechange, { 63, 63, 191, 50 } },
+ { EventTrackingRegions::EventType::Touchmove, { 80, 204, 245, 50 } },
+ { EventTrackingRegions::EventType::Touchstart, { 191, 191, 63, 50 } },
+ { EventTrackingRegions::EventType::Wheel, { 255, 128, 0, 50 } },
};
constexpr SortedArrayMap colors { colorMappings };
constexpr auto defaultColor = Color::black.colorWithAlphaByte(64);
@@ -212,20 +212,20 @@
};
#if ENABLE(TOUCH_EVENTS)
- auto drawEventLegend = [&](EventTrackingRegions::Event event) {
- drawLegend(colors.get(event), EventTrackingRegions::eventName(event));
+ auto drawEventLegend = [&](EventTrackingRegions::EventType eventType) {
+ drawLegend(colors.get(eventType), EventTrackingRegions::eventName(eventType));
};
- drawEventLegend(EventTrackingRegions::Event::Touchstart);
- drawEventLegend(EventTrackingRegions::Event::Touchmove);
- drawEventLegend(EventTrackingRegions::Event::Touchend);
- drawEventLegend(EventTrackingRegions::Event::Touchforcechange);
+ drawEventLegend(EventTrackingRegions::EventType::Touchstart);
+ drawEventLegend(EventTrackingRegions::EventType::Touchmove);
+ drawEventLegend(EventTrackingRegions::EventType::Touchend);
+ drawEventLegend(EventTrackingRegions::EventType::Touchforcechange);
drawLegend(m_color, "passive listeners"_s);
- drawEventLegend(EventTrackingRegions::Event::Mousedown);
- drawEventLegend(EventTrackingRegions::Event::Mousemove);
- drawEventLegend(EventTrackingRegions::Event::Mouseup);
+ drawEventLegend(EventTrackingRegions::EventType::Mousedown);
+ drawEventLegend(EventTrackingRegions::EventType::Mousemove);
+ drawEventLegend(EventTrackingRegions::EventType::Mouseup);
#else
// On desktop platforms, the "wheel" region includes the non-fast scrollable region.
- drawLegend(colors.get(EventTrackingRegions::Event::Wheel), "non-fast region"_s);
+ drawLegend(colors.get(EventTrackingRegions::EventType::Wheel), "non-fast region"_s);
#endif
for (auto& region : m_eventTrackingRegions.eventSpecificSynchronousDispatchRegions)
Modified: trunk/Source/WebCore/page/Page.cpp (294208 => 294209)
--- trunk/Source/WebCore/page/Page.cpp 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/page/Page.cpp 2022-05-14 20:08:58 UTC (rev 294209)
@@ -549,7 +549,7 @@
return DOMRectList::create(quads);
}
-Ref<DOMRectList> Page::touchEventRectsForEventForTesting(EventTrackingRegions::Event event)
+Ref<DOMRectList> Page::touchEventRectsForEventForTesting(EventTrackingRegions::EventType eventType)
{
if (Document* document = m_mainFrame->document()) {
document->updateLayout();
@@ -561,7 +561,7 @@
Vector<IntRect> rects;
if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) {
const EventTrackingRegions& eventTrackingRegions = scrollingCoordinator->absoluteEventTrackingRegions();
- const auto& region = eventTrackingRegions.eventSpecificSynchronousDispatchRegions.get(event);
+ const auto& region = eventTrackingRegions.eventSpecificSynchronousDispatchRegions.get(eventType);
rects.appendVector(region.rects());
}
Modified: trunk/Source/WebCore/page/Page.h (294208 => 294209)
--- trunk/Source/WebCore/page/Page.h 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/page/Page.h 2022-05-14 20:08:58 UTC (rev 294209)
@@ -361,7 +361,7 @@
WEBCORE_EXPORT String synchronousScrollingReasonsAsText();
WEBCORE_EXPORT Ref<DOMRectList> nonFastScrollableRectsForTesting();
- WEBCORE_EXPORT Ref<DOMRectList> touchEventRectsForEventForTesting(EventTrackingRegions::Event);
+ WEBCORE_EXPORT Ref<DOMRectList> touchEventRectsForEventForTesting(EventTrackingRegions::EventType);
WEBCORE_EXPORT Ref<DOMRectList> passiveTouchEventListenerRectsForTesting();
WEBCORE_EXPORT void settingsDidChange();
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (294208 => 294209)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2022-05-14 20:08:58 UTC (rev 294209)
@@ -178,7 +178,7 @@
#endif
// FIXME: If this is not the main frame, we could clip the region to the frame's bounds.
- eventTrackingRegions.uniteSynchronousRegion(EventTrackingRegions::Event::Wheel, nonFastScrollableRegion);
+ eventTrackingRegions.uniteSynchronousRegion(EventTrackingRegions::EventType::Wheel, nonFastScrollableRegion);
return eventTrackingRegions;
#endif
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (294208 => 294209)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2022-05-14 20:08:58 UTC (rev 294209)
@@ -95,8 +95,8 @@
IntPoint roundedPosition = roundedIntPoint(position);
// Event regions are affected by page scale, so no need to map through scale.
- bool isSynchronousDispatchRegion = m_treeState.eventTrackingRegions.trackingTypeForPoint(EventTrackingRegions::Event::Wheel, roundedPosition) == TrackingType::Synchronous
- || m_treeState.eventTrackingRegions.trackingTypeForPoint(EventTrackingRegions::Event::Mousewheel, roundedPosition) == TrackingType::Synchronous;
+ bool isSynchronousDispatchRegion = m_treeState.eventTrackingRegions.trackingTypeForPoint(EventTrackingRegions::EventType::Wheel, roundedPosition) == TrackingType::Synchronous
+ || m_treeState.eventTrackingRegions.trackingTypeForPoint(EventTrackingRegions::EventType::Mousewheel, roundedPosition) == TrackingType::Synchronous;
LOG_WITH_STREAM(Scrolling, stream << "\nScrollingTree::determineWheelEventProcessing: wheelEvent " << wheelEvent << " mapped to content point " << position << ", in non-fast region " << isSynchronousDispatchRegion);
if (isSynchronousDispatchRegion)
@@ -541,10 +541,10 @@
return m_treeState.gestureState;
}
-TrackingType ScrollingTree::eventTrackingTypeForPoint(EventTrackingRegions::Event event, IntPoint p)
+TrackingType ScrollingTree::eventTrackingTypeForPoint(EventTrackingRegions::EventType eventType, IntPoint p)
{
Locker locker { m_treeStateLock };
- return m_treeState.eventTrackingRegions.trackingTypeForPoint(event, p);
+ return m_treeState.eventTrackingRegions.trackingTypeForPoint(eventType, p);
}
// Can be called from the main thread.
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (294208 => 294209)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2022-05-14 20:08:58 UTC (rev 294209)
@@ -157,7 +157,7 @@
virtual void scrollingTreeNodeDidEndScroll(ScrollingNodeID) { }
#endif
- WEBCORE_EXPORT TrackingType eventTrackingTypeForPoint(EventTrackingRegions::Event, IntPoint);
+ WEBCORE_EXPORT TrackingType eventTrackingTypeForPoint(EventTrackingRegions::EventType, IntPoint);
virtual WheelEventTestMonitor* wheelEventTestMonitor() { return nullptr; }
Modified: trunk/Source/WebCore/platform/EventTrackingRegions.cpp (294208 => 294209)
--- trunk/Source/WebCore/platform/EventTrackingRegions.cpp 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/platform/EventTrackingRegions.cpp 2022-05-14 20:08:58 UTC (rev 294209)
@@ -26,50 +26,91 @@
#include "config.h"
#include "EventTrackingRegions.h"
+#include "EventNames.h"
+
namespace WebCore {
-ASCIILiteral EventTrackingRegions::eventName(Event event)
+ASCIILiteral EventTrackingRegions::eventName(EventType eventType)
{
- switch (event) {
- case Event::Mousedown:
+ switch (eventType) {
+ case EventType::Mousedown:
return "mousedown"_s;
- case Event::Mousemove:
+ case EventType::Mousemove:
return "mousemove"_s;
- case Event::Mouseup:
+ case EventType::Mouseup:
return "mouseup"_s;
- case Event::Mousewheel:
+ case EventType::Mousewheel:
return "mousewheel"_s;
- case Event::Pointerdown:
+ case EventType::Pointerdown:
return "pointerdown"_s;
- case Event::Pointerenter:
+ case EventType::Pointerenter:
return "pointerenter"_s;
- case Event::Pointerleave:
+ case EventType::Pointerleave:
return "pointerleave"_s;
- case Event::Pointermove:
+ case EventType::Pointermove:
return "pointermove"_s;
- case Event::Pointerout:
+ case EventType::Pointerout:
return "pointerout"_s;
- case Event::Pointerover:
+ case EventType::Pointerover:
return "pointerover"_s;
- case Event::Pointerup:
+ case EventType::Pointerup:
return "pointerup"_s;
- case Event::Touchend:
+ case EventType::Touchend:
return "touchend"_s;
- case Event::Touchforcechange:
+ case EventType::Touchforcechange:
return "touchforcechange"_s;
- case Event::Touchmove:
+ case EventType::Touchmove:
return "touchmove"_s;
- case Event::Touchstart:
+ case EventType::Touchstart:
return "touchstart"_s;
- case Event::Wheel:
+ case EventType::Wheel:
return "wheel"_s;
}
return ASCIILiteral();
}
-TrackingType EventTrackingRegions::trackingTypeForPoint(Event event, const IntPoint& point)
+const AtomString& EventTrackingRegions::eventNameAtomString(const EventNames& eventNames, EventType eventType)
{
- auto synchronousRegionIterator = eventSpecificSynchronousDispatchRegions.find(event);
+ switch (eventType) {
+ case EventType::Mousedown:
+ return eventNames.mousedownEvent;
+ case EventType::Mousemove:
+ return eventNames.mousemoveEvent;
+ case EventType::Mouseup:
+ return eventNames.mouseupEvent;
+ case EventType::Mousewheel:
+ return eventNames.mousewheelEvent;
+ case EventType::Pointerdown:
+ return eventNames.pointerdownEvent;
+ case EventType::Pointerenter:
+ return eventNames.pointerenterEvent;
+ case EventType::Pointerleave:
+ return eventNames.pointerleaveEvent;
+ case EventType::Pointermove:
+ return eventNames.pointermoveEvent;
+ case EventType::Pointerout:
+ return eventNames.pointeroutEvent;
+ case EventType::Pointerover:
+ return eventNames.pointeroverEvent;
+ case EventType::Pointerup:
+ return eventNames.pointerupEvent;
+ case EventType::Touchend:
+ return eventNames.touchendEvent;
+ case EventType::Touchforcechange:
+ return eventNames.touchforcechangeEvent;
+ case EventType::Touchmove:
+ return eventNames.touchmoveEvent;
+ case EventType::Touchstart:
+ return eventNames.touchstartEvent;
+ case EventType::Wheel:
+ return eventNames.wheelEvent;
+ }
+ return nullAtom();
+}
+
+TrackingType EventTrackingRegions::trackingTypeForPoint(EventType eventType, const IntPoint& point)
+{
+ auto synchronousRegionIterator = eventSpecificSynchronousDispatchRegions.find(eventType);
if (synchronousRegionIterator != eventSpecificSynchronousDispatchRegions.end()) {
if (synchronousRegionIterator->value.contains(point))
return TrackingType::Synchronous;
@@ -92,12 +133,12 @@
slot.value.translate(offset);
}
-void EventTrackingRegions::uniteSynchronousRegion(Event event, const Region& region)
+void EventTrackingRegions::uniteSynchronousRegion(EventType eventType, const Region& region)
{
if (region.isEmpty())
return;
- auto addResult = eventSpecificSynchronousDispatchRegions.add(event, region);
+ auto addResult = eventSpecificSynchronousDispatchRegions.add(eventType, region);
if (!addResult.isNewEntry)
addResult.iterator->value.unite(region);
}
Modified: trunk/Source/WebCore/platform/EventTrackingRegions.h (294208 => 294209)
--- trunk/Source/WebCore/platform/EventTrackingRegions.h 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/platform/EventTrackingRegions.h 2022-05-14 20:08:58 UTC (rev 294209)
@@ -33,6 +33,8 @@
namespace WebCore {
+struct EventNames;
+
enum class TrackingType : uint8_t {
NotTracking = 0,
Asynchronous = 1,
@@ -40,7 +42,7 @@
};
struct EventTrackingRegions {
- enum class Event : uint8_t {
+ enum class EventType : uint8_t {
Mousedown,
Mousemove,
Mouseup,
@@ -59,23 +61,24 @@
Wheel,
};
- WEBCORE_EXPORT static ASCIILiteral eventName(Event);
+ WEBCORE_EXPORT static ASCIILiteral eventName(EventType);
+ WEBCORE_EXPORT static const AtomString& eventNameAtomString(const EventNames&, EventType);
// Region for which events can be dispatched without blocking scrolling.
Region asynchronousDispatchRegion;
// Regions for which events must be sent before performing the default behavior.
- // The key is the Event Name with an active handler.
- using EventSpecificSynchronousDispatchRegions = HashMap<Event, Region, WTF::IntHash<Event>, WTF::StrongEnumHashTraits<Event>>;
+ // The key is the EventType with an active handler.
+ using EventSpecificSynchronousDispatchRegions = HashMap<EventType, Region, WTF::IntHash<EventType>, WTF::StrongEnumHashTraits<EventType>>;
EventSpecificSynchronousDispatchRegions eventSpecificSynchronousDispatchRegions;
bool isEmpty() const;
void translate(IntSize);
- void uniteSynchronousRegion(Event, const Region&);
+ void uniteSynchronousRegion(EventType, const Region&);
void unite(const EventTrackingRegions&);
- TrackingType trackingTypeForPoint(Event, const IntPoint&);
+ TrackingType trackingTypeForPoint(EventType, const IntPoint&);
};
bool operator==(const EventTrackingRegions&, const EventTrackingRegions&);
@@ -85,25 +88,25 @@
namespace WTF {
-template<> struct EnumTraits<WebCore::EventTrackingRegions::Event> {
+template<> struct EnumTraits<WebCore::EventTrackingRegions::EventType> {
using values = EnumValues<
- WebCore::EventTrackingRegions::Event,
- WebCore::EventTrackingRegions::Event::Mousedown,
- WebCore::EventTrackingRegions::Event::Mousemove,
- WebCore::EventTrackingRegions::Event::Mouseup,
- WebCore::EventTrackingRegions::Event::Mousewheel,
- WebCore::EventTrackingRegions::Event::Pointerdown,
- WebCore::EventTrackingRegions::Event::Pointerenter,
- WebCore::EventTrackingRegions::Event::Pointerleave,
- WebCore::EventTrackingRegions::Event::Pointermove,
- WebCore::EventTrackingRegions::Event::Pointerout,
- WebCore::EventTrackingRegions::Event::Pointerover,
- WebCore::EventTrackingRegions::Event::Pointerup,
- WebCore::EventTrackingRegions::Event::Touchend,
- WebCore::EventTrackingRegions::Event::Touchforcechange,
- WebCore::EventTrackingRegions::Event::Touchmove,
- WebCore::EventTrackingRegions::Event::Touchstart,
- WebCore::EventTrackingRegions::Event::Wheel
+ WebCore::EventTrackingRegions::EventType,
+ WebCore::EventTrackingRegions::EventType::Mousedown,
+ WebCore::EventTrackingRegions::EventType::Mousemove,
+ WebCore::EventTrackingRegions::EventType::Mouseup,
+ WebCore::EventTrackingRegions::EventType::Mousewheel,
+ WebCore::EventTrackingRegions::EventType::Pointerdown,
+ WebCore::EventTrackingRegions::EventType::Pointerenter,
+ WebCore::EventTrackingRegions::EventType::Pointerleave,
+ WebCore::EventTrackingRegions::EventType::Pointermove,
+ WebCore::EventTrackingRegions::EventType::Pointerout,
+ WebCore::EventTrackingRegions::EventType::Pointerover,
+ WebCore::EventTrackingRegions::EventType::Pointerup,
+ WebCore::EventTrackingRegions::EventType::Touchend,
+ WebCore::EventTrackingRegions::EventType::Touchforcechange,
+ WebCore::EventTrackingRegions::EventType::Touchmove,
+ WebCore::EventTrackingRegions::EventType::Touchstart,
+ WebCore::EventTrackingRegions::EventType::Wheel
>;
};
Modified: trunk/Source/WebCore/testing/Internals.cpp (294208 => 294209)
--- trunk/Source/WebCore/testing/Internals.cpp 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebCore/testing/Internals.cpp 2022-05-14 20:08:58 UTC (rev 294209)
@@ -2319,14 +2319,14 @@
if (!document || !document->page())
return Exception { InvalidAccessError };
- std::array<EventTrackingRegions::Event, 4> touchEvents = { {
- EventTrackingRegions::Event::Touchstart,
- EventTrackingRegions::Event::Touchmove,
- EventTrackingRegions::Event::Touchend,
- EventTrackingRegions::Event::Touchforcechange,
+ std::array<EventTrackingRegions::EventType, 4> touchEvents = { {
+ EventTrackingRegions::EventType::Touchstart,
+ EventTrackingRegions::EventType::Touchmove,
+ EventTrackingRegions::EventType::Touchend,
+ EventTrackingRegions::EventType::Touchforcechange,
} };
- std::optional<EventTrackingRegions::Event> touchEvent;
+ std::optional<EventTrackingRegions::EventType> touchEvent;
for (auto event : touchEvents) {
if (eventName == EventTrackingRegions::eventName(event)) {
touchEvent = event;
Modified: trunk/Source/WebKit/ChangeLog (294208 => 294209)
--- trunk/Source/WebKit/ChangeLog 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebKit/ChangeLog 2022-05-14 20:08:58 UTC (rev 294209)
@@ -1,3 +1,18 @@
+2022-05-10 Yusuke Suzuki <ysuz...@apple.com>
+
+ Rename EventTrackingRegions::Event to EventTrackingRegions::EventType
+ https://bugs.webkit.org/show_bug.cgi?id=240295
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<EventTrackingRegions>::decode):
+ * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
+ (WebKit::RemoteScrollingCoordinatorProxy::eventTrackingTypeForPoint const):
+ * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::updateTouchEventTracking):
+
2022-05-14 Kimmo Kinnunen <kkinnu...@apple.com>
WebCore::IOSurface refers to unused context size
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp (294208 => 294209)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp 2022-05-14 20:08:58 UTC (rev 294209)
@@ -195,9 +195,9 @@
m_scrollingTree->handleMouseEvent(event);
}
-TrackingType RemoteScrollingCoordinatorProxy::eventTrackingTypeForPoint(WebCore::EventTrackingRegions::Event event, IntPoint p) const
+TrackingType RemoteScrollingCoordinatorProxy::eventTrackingTypeForPoint(WebCore::EventTrackingRegions::EventType eventType, IntPoint p) const
{
- return m_scrollingTree->eventTrackingTypeForPoint(event, p);
+ return m_scrollingTree->eventTrackingTypeForPoint(eventType, p);
}
void RemoteScrollingCoordinatorProxy::viewportChangedViaDelegatedScrolling(const FloatPoint& scrollPosition, const FloatRect& layoutViewport, double scale)
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h (294208 => 294209)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h 2022-05-14 20:08:58 UTC (rev 294209)
@@ -62,7 +62,7 @@
bool scrollingTreeNodeRequestsScroll(WebCore::ScrollingNodeID, const WebCore::RequestedScrollData&);
void scrollingTreeNodeDidStopAnimatedScroll(WebCore::ScrollingNodeID);
- WebCore::TrackingType eventTrackingTypeForPoint(WebCore::EventTrackingRegions::Event, WebCore::IntPoint) const;
+ WebCore::TrackingType eventTrackingTypeForPoint(WebCore::EventTrackingRegions::EventType, WebCore::IntPoint) const;
// Called externally when native views move around.
void viewportChangedViaDelegatedScrolling(const WebCore::FloatPoint& scrollPosition, const WebCore::FloatRect& layoutViewport, double scale);
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (294208 => 294209)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2022-05-14 19:15:53 UTC (rev 294208)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2022-05-14 20:08:58 UTC (rev 294209)
@@ -3067,28 +3067,28 @@
#if ENABLE(ASYNC_SCROLLING) && PLATFORM(COCOA)
for (auto& touchPoint : touchStartEvent.touchPoints()) {
IntPoint location = touchPoint.location();
- auto updateTrackingType = [this, location](TrackingType& trackingType, EventTrackingRegions::Event event) {
+ auto updateTrackingType = [this, location](TrackingType& trackingType, EventTrackingRegions::EventType eventType) {
if (trackingType == TrackingType::Synchronous)
return;
- TrackingType trackingTypeForLocation = m_scrollingCoordinatorProxy->eventTrackingTypeForPoint(event, location);
+ TrackingType trackingTypeForLocation = m_scrollingCoordinatorProxy->eventTrackingTypeForPoint(eventType, location);
trackingType = mergeTrackingTypes(trackingType, trackingTypeForLocation);
};
- updateTrackingType(m_touchAndPointerEventTracking.touchForceChangedTracking, EventTrackingRegions::Event::Touchforcechange);
- updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::Event::Touchstart);
- updateTrackingType(m_touchAndPointerEventTracking.touchMoveTracking, EventTrackingRegions::Event::Touchmove);
- updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::Event::Touchend);
- updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::Event::Pointerover);
- updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::Event::Pointerenter);
- updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::Event::Pointerdown);
- updateTrackingType(m_touchAndPointerEventTracking.touchMoveTracking, EventTrackingRegions::Event::Pointermove);
- updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::Event::Pointerup);
- updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::Event::Pointerout);
- updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::Event::Pointerleave);
- updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::Event::Mousedown);
- updateTrackingType(m_touchAndPointerEventTracking.touchMoveTracking, EventTrackingRegions::Event::Mousemove);
- updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::Event::Mouseup);
+ updateTrackingType(m_touchAndPointerEventTracking.touchForceChangedTracking, EventTrackingRegions::EventType::Touchforcechange);
+ updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::EventType::Touchstart);
+ updateTrackingType(m_touchAndPointerEventTracking.touchMoveTracking, EventTrackingRegions::EventType::Touchmove);
+ updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::EventType::Touchend);
+ updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::EventType::Pointerover);
+ updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::EventType::Pointerenter);
+ updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::EventType::Pointerdown);
+ updateTrackingType(m_touchAndPointerEventTracking.touchMoveTracking, EventTrackingRegions::EventType::Pointermove);
+ updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::EventType::Pointerup);
+ updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::EventType::Pointerout);
+ updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::EventType::Pointerleave);
+ updateTrackingType(m_touchAndPointerEventTracking.touchStartTracking, EventTrackingRegions::EventType::Mousedown);
+ updateTrackingType(m_touchAndPointerEventTracking.touchMoveTracking, EventTrackingRegions::EventType::Mousemove);
+ updateTrackingType(m_touchAndPointerEventTracking.touchEndTracking, EventTrackingRegions::EventType::Mouseup);
}
#else
UNUSED_PARAM(touchStartEvent);
