summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/timing/event_timing.cc
diff options
context:
space:
mode:
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.cc19
1 files changed, 6 insertions, 13 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 3110fb11531..f45a5a3c10c 100644
--- a/chromium/third_party/blink/renderer/core/timing/event_timing.cc
+++ b/chromium/third_party/blink/renderer/core/timing/event_timing.cc
@@ -12,14 +12,13 @@
#include "third_party/blink/renderer/core/timing/dom_window_performance.h"
#include "third_party/blink/renderer/core/timing/performance_event_timing.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
-#include "third_party/blink/renderer/platform/wtf/time.h"
namespace {
const base::TickClock* g_clock_for_testing = nullptr;
static base::TimeTicks Now() {
return g_clock_for_testing ? g_clock_for_testing->NowTicks()
- : CurrentTimeTicks();
+ : base::TimeTicks::Now();
}
} // namespace
@@ -49,18 +48,12 @@ bool ShouldReportForEventTiming(WindowPerformance* performance) {
performance->GetExecutionContext()))
return false;
- if (performance->HasObserverFor(PerformanceEntry::kEvent))
- return true;
- if (performance->ShouldBufferEntries() &&
- !performance->IsEventTimingBufferFull()) {
- return true;
- }
-
- return false;
+ return (!performance->IsEventTimingBufferFull() ||
+ performance->HasObserverFor(PerformanceEntry::kEvent));
}
-EventTiming::EventTiming(TimeTicks processing_start,
- TimeTicks event_timestamp,
+EventTiming::EventTiming(base::TimeTicks processing_start,
+ base::TimeTicks event_timestamp,
WindowPerformance* performance)
: processing_start_(processing_start),
event_timestamp_(event_timestamp),
@@ -79,7 +72,7 @@ std::unique_ptr<EventTiming> EventTiming::Create(LocalDOMWindow* window,
if (!should_report_for_event_timing && !should_log_event)
return nullptr;
- TimeTicks event_timestamp =
+ base::TimeTicks event_timestamp =
event.IsPointerEvent() ? ToPointerEvent(&event)->OldestPlatformTimeStamp()
: event.PlatformTimeStamp();