Commit 43eaeaee authored by Nicolás Peña Moreno's avatar Nicolás Peña Moreno Committed by Commit Bot

Fix longtasks parameters to all be AtomicString

Currently, AddLongTaskTiming()'s last 3 parameters are String instead of
AtomicString. However, the values are ultimately stored as AtomicString
and the parameters passed are already AtomicString. Looking at the impl
of AtomicString, it is not a String, which means that we have to convert
the AtomicString to String and then back to AtomicString. This CL fixes
this.

Bug: 1141632
Change-Id: I72db0b0bc2ca96f2b831e8faf195c22acb4be0f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2555562Reviewed-by: default avatarSteve Kobes <skobes@chromium.org>
Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830549}
parent 5143aa95
...@@ -672,9 +672,9 @@ void Performance::AddLongTaskTiming(base::TimeTicks start_time, ...@@ -672,9 +672,9 @@ void Performance::AddLongTaskTiming(base::TimeTicks start_time,
base::TimeTicks end_time, base::TimeTicks end_time,
const AtomicString& name, const AtomicString& name,
const AtomicString& container_type, const AtomicString& container_type,
const String& container_src, const AtomicString& container_src,
const String& container_id, const AtomicString& container_id,
const String& container_name) { const AtomicString& container_name) {
auto* entry = MakeGarbageCollected<PerformanceLongTaskTiming>( auto* entry = MakeGarbageCollected<PerformanceLongTaskTiming>(
MonotonicTimeToDOMHighResTimeStamp(start_time), MonotonicTimeToDOMHighResTimeStamp(start_time),
MonotonicTimeToDOMHighResTimeStamp(end_time), name, container_type, MonotonicTimeToDOMHighResTimeStamp(end_time), name, container_type,
......
...@@ -159,9 +159,9 @@ class CORE_EXPORT Performance : public EventTargetWithInlineData { ...@@ -159,9 +159,9 @@ class CORE_EXPORT Performance : public EventTargetWithInlineData {
base::TimeTicks end_time, base::TimeTicks end_time,
const AtomicString& name, const AtomicString& name,
const AtomicString& container_type, const AtomicString& container_type,
const String& container_src, const AtomicString& container_src,
const String& container_id, const AtomicString& container_id,
const String& container_name); const AtomicString& container_name);
// Generates and add a performance entry for the given ResourceTimingInfo. // Generates and add a performance entry for the given ResourceTimingInfo.
// |overridden_initiator_type| allows the initiator type to be overridden to // |overridden_initiator_type| allows the initiator type to be overridden to
......
...@@ -18,9 +18,9 @@ PerformanceLongTaskTiming::PerformanceLongTaskTiming( ...@@ -18,9 +18,9 @@ PerformanceLongTaskTiming::PerformanceLongTaskTiming(
double end_time, double end_time,
const AtomicString& name, const AtomicString& name,
const AtomicString& culprit_type, const AtomicString& culprit_type,
const String& culprit_src, const AtomicString& culprit_src,
const String& culprit_id, const AtomicString& culprit_id,
const String& culprit_name) const AtomicString& culprit_name)
: PerformanceEntry(name, start_time, end_time) { : PerformanceEntry(name, start_time, end_time) {
auto* attribution_entry = MakeGarbageCollected<TaskAttributionTiming>( auto* attribution_entry = MakeGarbageCollected<TaskAttributionTiming>(
"unknown", culprit_type, culprit_src, culprit_id, culprit_name); "unknown", culprit_type, culprit_src, culprit_id, culprit_name);
......
...@@ -23,9 +23,9 @@ class PerformanceLongTaskTiming final : public PerformanceEntry { ...@@ -23,9 +23,9 @@ class PerformanceLongTaskTiming final : public PerformanceEntry {
double end_time, double end_time,
const AtomicString& name, const AtomicString& name,
const AtomicString& culprit_type, const AtomicString& culprit_type,
const String& culprit_src, const AtomicString& culprit_src,
const String& culprit_id, const AtomicString& culprit_id,
const String& culprit_name); const AtomicString& culprit_name);
AtomicString entryType() const override; AtomicString entryType() const override;
PerformanceEntryType EntryTypeEnum() const override; PerformanceEntryType EntryTypeEnum() const override;
......
...@@ -12,9 +12,9 @@ namespace blink { ...@@ -12,9 +12,9 @@ namespace blink {
TaskAttributionTiming::TaskAttributionTiming(const AtomicString& name, TaskAttributionTiming::TaskAttributionTiming(const AtomicString& name,
const AtomicString& container_type, const AtomicString& container_type,
const String& container_src, const AtomicString& container_src,
const String& container_id, const AtomicString& container_id,
const String& container_name) const AtomicString& container_name)
: PerformanceEntry(name, 0.0, 0.0), : PerformanceEntry(name, 0.0, 0.0),
container_type_(container_type), container_type_(container_type),
container_src_(container_src), container_src_(container_src),
......
...@@ -28,9 +28,9 @@ class TaskAttributionTiming final : public PerformanceEntry { ...@@ -28,9 +28,9 @@ class TaskAttributionTiming final : public PerformanceEntry {
TaskAttributionTiming(const AtomicString& type, TaskAttributionTiming(const AtomicString& type,
const AtomicString& container_type, const AtomicString& container_type,
const String& container_src, const AtomicString& container_src,
const String& container_id, const AtomicString& container_id,
const String& container_name); const AtomicString& container_name);
~TaskAttributionTiming() override; ~TaskAttributionTiming() override;
private: private:
......
...@@ -314,7 +314,7 @@ void WindowPerformance::ReportLongTask(base::TimeTicks start_time, ...@@ -314,7 +314,7 @@ void WindowPerformance::ReportLongTask(base::TimeTicks start_time,
if (!culprit_dom_window || !culprit_dom_window->GetFrame() || if (!culprit_dom_window || !culprit_dom_window->GetFrame() ||
!culprit_dom_window->GetFrame()->DeprecatedLocalOwner()) { !culprit_dom_window->GetFrame()->DeprecatedLocalOwner()) {
AddLongTaskTiming(start_time, end_time, attribution.first, "window", AddLongTaskTiming(start_time, end_time, attribution.first, "window",
g_empty_string, g_empty_string, g_empty_string); g_empty_atom, g_empty_atom, g_empty_atom);
} else { } else {
HTMLFrameOwnerElement* frame_owner = HTMLFrameOwnerElement* frame_owner =
culprit_dom_window->GetFrame()->DeprecatedLocalOwner(); culprit_dom_window->GetFrame()->DeprecatedLocalOwner();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment