Create TaskAttributionTiming PerformanceEntry for attribution in PerformanceLongTaskTiming. Move cu…

third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.cpp

Index: third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.cpp
diff --git a/third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.cpp b/third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.cpp
index 6b9032c647c9b6071fc0a6423dfbec676c70ceef..18b42f35bcf54780ba48b4b559e7d53ebdc12051 100644
--- a/third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.cpp
+++ b/third_party/WebKit/Source/core/timing/PerformanceLongTaskTiming.cpp
@@ -5,6 +5,7 @@
 #include "core/timing/PerformanceLongTaskTiming.h"
 
 #include "core/frame/DOMWindow.h"
+#include "core/timing/TaskAttributionTiming.h"
 
 namespace blink {
 
@@ -17,6 +18,19 @@ double clampToMillisecond(double timeInMillis) {
 
 }  // namespace
 
+// static
+PerformanceLongTaskTiming* PerformanceLongTaskTiming::create(
+    double startTime,
+    double endTime,
+    String name,
+    String culpritFrameSrc,
+    String culpritFrameId,
+    String culpritFrameName) {

[tdresser, 2017/01/05 13:34:14]

I'd strip the culprit prefix throughout - I don't think it adds anything, and
currently the naming is inconsistent.

[panicker, 2017/01/05 20:56:49]

Done.

+  return new PerformanceLongTaskTiming(startTime, endTime, name,
+                                       culpritFrameSrc, culpritFrameId,
+                                       culpritFrameName);
+}
+
 PerformanceLongTaskTiming::PerformanceLongTaskTiming(double startTime,
                                                      double endTime,
                                                      String name,
@@ -26,26 +40,21 @@ PerformanceLongTaskTiming::PerformanceLongTaskTiming(double startTime,
     : PerformanceEntry(name,
                        "longtask",
                        clampToMillisecond(startTime),
-                       clampToMillisecond(endTime)),
-      m_culpritFrameSrc(culpritFrameSrc),
-      m_culpritFrameId(culpritFrameId),
-      m_culpritFrameName(culpritFrameName) {}
-
-PerformanceLongTaskTiming::~PerformanceLongTaskTiming() {}
-
-String PerformanceLongTaskTiming::culpritFrameSrc() const {
-  return m_culpritFrameSrc;
+                       clampToMillisecond(endTime)) {
+  // Only one possible name ("frame") currently.
+  TaskAttributionTiming* attributionEntry = TaskAttributionTiming::create(
+      "frame", culpritFrameSrc, culpritFrameId, culpritFrameName);
+  m_attribution.append(*attributionEntry);
 }
 
-String PerformanceLongTaskTiming::culpritFrameId() const {
-  return m_culpritFrameId;
-}
+PerformanceLongTaskTiming::~PerformanceLongTaskTiming() {}
 
-String PerformanceLongTaskTiming::culpritFrameName() const {
-  return m_culpritFrameName;
+TaskAttributionVector PerformanceLongTaskTiming::attribution() const {
+  return m_attribution;
 }
 
 DEFINE_TRACE(PerformanceLongTaskTiming) {
+  visitor->trace(m_attribution);
   PerformanceEntry::trace(visitor);
 }