Diff
Modified: branches/safari-612.4.2.1-branch/Source/WTF/ChangeLog (286730 => 286731)
--- branches/safari-612.4.2.1-branch/Source/WTF/ChangeLog 2021-12-08 21:26:20 UTC (rev 286730)
+++ branches/safari-612.4.2.1-branch/Source/WTF/ChangeLog 2021-12-08 21:26:23 UTC (rev 286731)
@@ -1,3 +1,43 @@
+2021-12-06 Alan Coon <[email protected]>
+
+ Cherry-pick r286537. rdar://problem/85928816
+
+ Add trace points for generated momentum events
+ https://bugs.webkit.org/show_bug.cgi?id=233857
+
+ Reviewed by Tim Horton.
+
+ Source/WebKit:
+
+ Add start/end points for synthetic momentum, and a trace point for each generated event.
+
+ * WebProcess/WebPage/MomentumEventDispatcher.cpp:
+ (WebKit::MomentumEventDispatcher::dispatchSyntheticMomentumEvent):
+ (WebKit::MomentumEventDispatcher::didStartMomentumPhase):
+ (WebKit::MomentumEventDispatcher::didEndMomentumPhase):
+
+ Source/WTF:
+
+ * wtf/SystemTracing.h:
+
+ Tools:
+
+ Add start/end points for synthetic momentum, and a trace point for each generated event.
+
+ * Tracing/SystemTracePoints.plist:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286537 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-05 Simon Fraser <[email protected]>
+
+ Add trace points for generated momentum events
+ https://bugs.webkit.org/show_bug.cgi?id=233857
+
+ Reviewed by Tim Horton.
+
+ * wtf/SystemTracing.h:
+
2021-12-03 Alan Coon <[email protected]>
Cherry-pick r286504. rdar://problem/85928816
Modified: branches/safari-612.4.2.1-branch/Source/WTF/wtf/SystemTracing.h (286730 => 286731)
--- branches/safari-612.4.2.1-branch/Source/WTF/wtf/SystemTracing.h 2021-12-08 21:26:20 UTC (rev 286730)
+++ branches/safari-612.4.2.1-branch/Source/WTF/wtf/SystemTracing.h 2021-12-08 21:26:23 UTC (rev 286731)
@@ -127,6 +127,9 @@
RenderServerSnapshotEnd,
TakeSnapshotStart,
TakeSnapshotEnd,
+ SyntheticMomentumStart,
+ SyntheticMomentumEnd,
+ SyntheticMomentumEvent,
UIProcessRange = 14000,
CommitLayerTreeStart,
Modified: branches/safari-612.4.2.1-branch/Source/WebKit/ChangeLog (286730 => 286731)
--- branches/safari-612.4.2.1-branch/Source/WebKit/ChangeLog 2021-12-08 21:26:20 UTC (rev 286730)
+++ branches/safari-612.4.2.1-branch/Source/WebKit/ChangeLog 2021-12-08 21:26:23 UTC (rev 286731)
@@ -1,3 +1,48 @@
+2021-12-06 Alan Coon <[email protected]>
+
+ Cherry-pick r286537. rdar://problem/85928816
+
+ Add trace points for generated momentum events
+ https://bugs.webkit.org/show_bug.cgi?id=233857
+
+ Reviewed by Tim Horton.
+
+ Source/WebKit:
+
+ Add start/end points for synthetic momentum, and a trace point for each generated event.
+
+ * WebProcess/WebPage/MomentumEventDispatcher.cpp:
+ (WebKit::MomentumEventDispatcher::dispatchSyntheticMomentumEvent):
+ (WebKit::MomentumEventDispatcher::didStartMomentumPhase):
+ (WebKit::MomentumEventDispatcher::didEndMomentumPhase):
+
+ Source/WTF:
+
+ * wtf/SystemTracing.h:
+
+ Tools:
+
+ Add start/end points for synthetic momentum, and a trace point for each generated event.
+
+ * Tracing/SystemTracePoints.plist:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286537 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-05 Simon Fraser <[email protected]>
+
+ Add trace points for generated momentum events
+ https://bugs.webkit.org/show_bug.cgi?id=233857
+
+ Reviewed by Tim Horton.
+
+ Add start/end points for synthetic momentum, and a trace point for each generated event.
+
+ * WebProcess/WebPage/MomentumEventDispatcher.cpp:
+ (WebKit::MomentumEventDispatcher::dispatchSyntheticMomentumEvent):
+ (WebKit::MomentumEventDispatcher::didStartMomentumPhase):
+ (WebKit::MomentumEventDispatcher::didEndMomentumPhase):
+
2021-12-03 Alan Coon <[email protected]>
Cherry-pick r286512. rdar://problem/85928816
Modified: branches/safari-612.4.2.1-branch/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.cpp (286730 => 286731)
--- branches/safari-612.4.2.1-branch/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.cpp 2021-12-08 21:26:20 UTC (rev 286730)
+++ branches/safari-612.4.2.1-branch/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.cpp 2021-12-08 21:26:23 UTC (rev 286731)
@@ -34,6 +34,7 @@
#include "WebProcessProxyMessages.h"
#include <WebCore/DisplayRefreshMonitor.h>
#include <WebCore/Scrollbar.h>
+#include <wtf/SystemTracing.h>
namespace WebKit {
@@ -144,6 +145,8 @@
void MomentumEventDispatcher::dispatchSyntheticMomentumEvent(WebWheelEvent::Phase phase, WebCore::FloatSize delta)
{
+ tracePoint(SyntheticMomentumEvent, static_cast<uint64_t>(phase), std::abs(delta.width()), std::abs(delta.height()));
+
ASSERT(m_currentGesture.active);
ASSERT(m_currentGesture.initiatingEvent);
@@ -182,6 +185,8 @@
void MomentumEventDispatcher::didStartMomentumPhase(WebCore::PageIdentifier pageIdentifier, const WebWheelEvent& event)
{
+ tracePoint(SyntheticMomentumStart);
+
auto momentumStartInterval = event.ioHIDEventTimestamp() - m_lastEndedEventTimestamp;
m_currentGesture.active = true;
@@ -223,6 +228,7 @@
stopDisplayLink();
m_currentGesture = { };
+ tracePoint(SyntheticMomentumEnd);
}
void MomentumEventDispatcher::setScrollingAccelerationCurve(WebCore::PageIdentifier pageIdentifier, std::optional<ScrollingAccelerationCurve> curve)
Modified: branches/safari-612.4.2.1-branch/Tools/ChangeLog (286730 => 286731)
--- branches/safari-612.4.2.1-branch/Tools/ChangeLog 2021-12-08 21:26:20 UTC (rev 286730)
+++ branches/safari-612.4.2.1-branch/Tools/ChangeLog 2021-12-08 21:26:23 UTC (rev 286731)
@@ -1,3 +1,45 @@
+2021-12-06 Alan Coon <[email protected]>
+
+ Cherry-pick r286537. rdar://problem/85928816
+
+ Add trace points for generated momentum events
+ https://bugs.webkit.org/show_bug.cgi?id=233857
+
+ Reviewed by Tim Horton.
+
+ Source/WebKit:
+
+ Add start/end points for synthetic momentum, and a trace point for each generated event.
+
+ * WebProcess/WebPage/MomentumEventDispatcher.cpp:
+ (WebKit::MomentumEventDispatcher::dispatchSyntheticMomentumEvent):
+ (WebKit::MomentumEventDispatcher::didStartMomentumPhase):
+ (WebKit::MomentumEventDispatcher::didEndMomentumPhase):
+
+ Source/WTF:
+
+ * wtf/SystemTracing.h:
+
+ Tools:
+
+ Add start/end points for synthetic momentum, and a trace point for each generated event.
+
+ * Tracing/SystemTracePoints.plist:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286537 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-05 Simon Fraser <[email protected]>
+
+ Add trace points for generated momentum events
+ https://bugs.webkit.org/show_bug.cgi?id=233857
+
+ Reviewed by Tim Horton.
+
+ Add start/end points for synthetic momentum, and a trace point for each generated event.
+
+ * Tracing/SystemTracePoints.plist:
+
2021-12-01 Alan Coon <[email protected]>
Cherry-pick r286368. rdar://problem/85928816
Modified: branches/safari-612.4.2.1-branch/Tools/Tracing/SystemTracePoints.plist (286730 => 286731)
--- branches/safari-612.4.2.1-branch/Tools/Tracing/SystemTracePoints.plist 2021-12-08 21:26:20 UTC (rev 286730)
+++ branches/safari-612.4.2.1-branch/Tools/Tracing/SystemTracePoints.plist 2021-12-08 21:26:23 UTC (rev 286731)
@@ -596,6 +596,48 @@
</dict>
<dict>
<key>Name</key>
+ <string>Synthetic momentum</string>
+ <key>Type</key>
+ <string>Interval</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>CodeBegin</key>
+ <string>12025</string>
+ <key>CodeEnd</key>
+ <string>12026</string>
+ <key>ArgNamesEnd</key>
+ <dict>
+ <key>Arg1</key>
+ <string>Initial Velocity X</string>
+ <key>Arg2</key>
+ <string>Initial Velocity Y</string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Name</key>
+ <string>Synthetic momentum event</string>
+ <key>Type</key>
+ <string>Level</string>
+ <key>Component</key>
+ <string>47</string>
+ <key>Code</key>
+ <string>12027</string>
+ <key>ArgNames</key>
+ <dict>
+ <key>Arg1</key>
+ <string>Phase</string>
+ <key>Arg2</key>
+ <string>Delta X</string>
+ <key>Arg3</key>
+ <string>Delta Y</string>
+ </dict>
+ <key>LevelArg</key>
+ <string>Arg3</string>
+ <key>LevelDataType</key>
+ <string>UInt64</string>
+ </dict>
+ <dict>
+ <key>Name</key>
<string>Commit RemoteLayerTree transaction</string>
<key>Type</key>
<string>Interval</string>
