Replace DOMWindow with iframe attrs: src, id, name

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

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2012 Intel Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 16 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/timing/Performance.h"
 
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8ObjectBuilder.h"
 #include "core/dom/Document.h"
+#include "core/dom/QualifiedName.h"
+#include "core/frame/DOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
+#include "core/html/HTMLFrameOwnerElement.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/origin_trials/OriginTrials.h"
 #include "core/timing/PerformanceTiming.h"
 
+#include <tuple>
+
 static const double kLongTaskThreshold = 0.05;
 
 static const char kUnknownAttribution[] = "unknown";
 static const char kAmbugiousAttribution[] = "multiple-contexts";
 static const char kSameOriginAttribution[] = "same-origin";
 static const char kAncestorAttribution[] = "cross-origin-ancestor";
 static const char kDescendantAttribution[] = "cross-origin-descendant";
 static const char kCrossOriginAttribution[] = "cross-origin-unreachable";
 
 namespace blink {
 
+namespace {
+
+String getFrameAttribute(HTMLFrameOwnerElement* frameOwner,
+                         const QualifiedName& attrName,
+                         bool truncate) {
+  String attrValue;
+  if (frameOwner->hasAttribute(attrName)) {
+    attrValue = frameOwner->getAttribute(attrName);
+    if (truncate && attrValue.length() > 100)
+      attrValue = attrValue.substring(0, 100);  // Truncate to 100 chars
+  }
+  return attrValue;
+}
+
+}  // namespace
+
 static double toTimeOrigin(LocalFrame* frame) {
   if (!frame)
     return 0.0;
 
   Document* document = frame->document();
   if (!document)
     return 0.0;
 
   DocumentLoader* loader = document->loader();
   if (!loader)
@@ skipping 118 matching lines @@
     }
     return std::make_pair(kDescendantAttribution,
                           lastCrossOriginFrame->domWindow());
   }
   if (observerFrame->tree().isDescendantOf(culpritFrame)) {
     return std::make_pair(kAncestorAttribution, nullptr);
   }
   return std::make_pair(kCrossOriginAttribution, nullptr);
 }
 
+std::tuple<String, String, String> Performance::culpritFrameAttributes(

[skobes, 2016/11/22 00:21:25]

It seems unnecessary to wrap these in a std::tuple only to unwrap them
immediately.  Could you just inline the getFrameAttribute(...) calls into the
line that calls addLongTaskTiming?

[panicker, 2016/11/22 00:39:47]

Agreed. Done.

+    HTMLFrameOwnerElement* frameOwner) {
+  return std::make_tuple(
+      getFrameAttribute(frameOwner, HTMLNames::srcAttr, false),
+      getFrameAttribute(frameOwner, HTMLNames::idAttr, true),
+      getFrameAttribute(frameOwner, HTMLNames::nameAttr, true));
+}
+
 void Performance::reportLongTask(
     double startTime,
     double endTime,
     const HeapHashSet<Member<Frame>>& contextFrames) {
   std::pair<String, DOMWindow*> attribution =
       Performance::sanitizedAttribution(contextFrames, frame());
-  addLongTaskTiming(startTime, endTime, attribution.first, attribution.second);
+  DOMWindow* culpritDomWindow = attribution.second;
+  if (!culpritDomWindow || !culpritDomWindow->document() ||
+      !culpritDomWindow->document()->localOwner()) {
+    addLongTaskTiming(startTime, endTime, attribution.first, "", "", "");
+  } else {
+    std::tuple<String, String, String> frameAttribution =
+        culpritFrameAttributes(culpritDomWindow->document()->localOwner());
+    addLongTaskTiming(
+        startTime, endTime, attribution.first, std::get<0>(frameAttribution),
+        std::get<1>(frameAttribution), std::get<2>(frameAttribution));
+  }
 }
 
 }  // namespace blink