diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-16 11:45:35 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-17 08:59:23 +0000 |
commit | 552906b0f222c5d5dd11b9fd73829d510980461a (patch) | |
tree | 3a11e6ed0538a81dd83b20cf3a4783e297f26d91 /chromium/third_party/blink/renderer/core/timing/event_timing.cc | |
parent | 1b05827804eaf047779b597718c03e7d38344261 (diff) | |
download | qtwebengine-chromium-552906b0f222c5d5dd11b9fd73829d510980461a.tar.gz |
BASELINE: Update Chromium to 83.0.4103.122
Change-Id: Ie3a82f5bb0076eec2a7c6a6162326b4301ee291e
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/timing/event_timing.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/timing/event_timing.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chromium/third_party/blink/renderer/core/timing/event_timing.cc b/chromium/third_party/blink/renderer/core/timing/event_timing.cc index f45a5a3c10c..693a61a0140 100644 --- a/chromium/third_party/blink/renderer/core/timing/event_timing.cc +++ b/chromium/third_party/blink/renderer/core/timing/event_timing.cc @@ -6,7 +6,10 @@ #include "base/time/tick_clock.h" #include "third_party/blink/renderer/core/dom/events/event.h" +#include "third_party/blink/renderer/core/events/keyboard_event.h" #include "third_party/blink/renderer/core/events/pointer_event.h" +#include "third_party/blink/renderer/core/events/touch_event.h" +#include "third_party/blink/renderer/core/events/wheel_event.h" #include "third_party/blink/renderer/core/frame/local_dom_window.h" #include "third_party/blink/renderer/core/loader/interactive_detector.h" #include "third_party/blink/renderer/core/timing/dom_window_performance.h" @@ -33,9 +36,9 @@ bool ShouldLogEvent(const Event& event) { } bool IsEventTypeForEventTiming(const Event& event) { - return (event.IsMouseEvent() || event.IsPointerEvent() || - event.IsTouchEvent() || event.IsKeyboardEvent() || - event.IsWheelEvent() || event.IsInputEvent() || + return (IsA<MouseEvent>(event) || IsA<PointerEvent>(event) || + IsA<TouchEvent>(event) || IsA<KeyboardEvent>(event) || + IsA<WheelEvent>(event) || event.IsInputEvent() || event.IsCompositionEvent()) && event.isTrusted(); } @@ -72,14 +75,15 @@ std::unique_ptr<EventTiming> EventTiming::Create(LocalDOMWindow* window, if (!should_report_for_event_timing && !should_log_event) return nullptr; + auto* pointer_event = DynamicTo<PointerEvent>(&event); base::TimeTicks event_timestamp = - event.IsPointerEvent() ? ToPointerEvent(&event)->OldestPlatformTimeStamp() - : event.PlatformTimeStamp(); + pointer_event ? pointer_event->OldestPlatformTimeStamp() + : event.PlatformTimeStamp(); base::TimeTicks processing_start = Now(); if (should_log_event) { Document* document = - DynamicTo<Document>(performance->GetExecutionContext()); + Document::DynamicFrom(performance->GetExecutionContext()); InteractiveDetector* interactive_detector = InteractiveDetector::From(*document); if (interactive_detector) { |