Replace InspectedFrames::root with pointer to directly stored LocalFrame

BUG=635596

Review-Url: https://codereview.chromium.org/2390863002
Cr-Commit-Position: refs/heads/master@{#422916}

third_party/WebKit/Source/core/inspector/InspectorWebPerfAgent.cpp

@@ -32,8 +32,8 @@ bool canAccessOrigin(Frame* frame1, Frame* frame2) {
 }
 }  // namespace
 
-InspectorWebPerfAgent::InspectorWebPerfAgent(InspectedFrames* inspectedFrames)
-    : m_inspectedFrames(inspectedFrames) {}
+InspectorWebPerfAgent::InspectorWebPerfAgent(LocalFrame* localFrame)
+    : m_localFrame(localFrame) {}
 
 InspectorWebPerfAgent::~InspectorWebPerfAgent() {
   DCHECK(!m_enabled);
@@ -42,16 +42,14 @@ InspectorWebPerfAgent::~InspectorWebPerfAgent() {
 void InspectorWebPerfAgent::enable() {
   Platform::current()->currentThread()->addTaskTimeObserver(this);
   Platform::current()->currentThread()->addTaskObserver(this);
-  m_inspectedFrames->root()->instrumentingAgents()->addInspectorWebPerfAgent(
-      this);
+  m_localFrame->instrumentingAgents()->addInspectorWebPerfAgent(this);
   m_enabled = true;
 }
 
 void InspectorWebPerfAgent::disable() {
   Platform::current()->currentThread()->removeTaskTimeObserver(this);
   Platform::current()->currentThread()->removeTaskObserver(this);
-  m_inspectedFrames->root()->instrumentingAgents()->removeInspectorWebPerfAgent(
-      this);
+  m_localFrame->instrumentingAgents()->removeInspectorWebPerfAgent(this);
   m_enabled = false;
 }
 
@@ -82,14 +80,14 @@ void InspectorWebPerfAgent::ReportTaskTime(scheduler::TaskQueue*,
                                            double endTime) {
   if (((endTime - startTime) * 1000) <= kLongTaskThresholdMillis)
     return;
-  DOMWindow* domWindow = m_inspectedFrames->root()->domWindow();
+  DOMWindow* domWindow = m_localFrame->domWindow();
   if (!domWindow)
     return;
   Performance* performance = DOMWindowPerformance::performance(*domWindow);
   DCHECK(performance);
   performance->addLongTaskTiming(
-      startTime, endTime, sanitizedLongTaskName(m_frameContextLocations,
-                                                m_inspectedFrames->root()));
+      startTime, endTime,
+      sanitizedLongTaskName(m_frameContextLocations, m_localFrame));
 }
 
 String InspectorWebPerfAgent::sanitizedLongTaskName(
@@ -114,7 +112,7 @@ String InspectorWebPerfAgent::sanitizedLongTaskName(
 }
 
 DEFINE_TRACE(InspectorWebPerfAgent) {
-  visitor->trace(m_inspectedFrames);
+  visitor->trace(m_localFrame);
   visitor->trace(m_frameContextLocations);
 }
 

third_party/WebKit/Source/core/inspector/InspectorWebPerfAgent.h

@@ -27,7 +27,7 @@ class CORE_EXPORT InspectorWebPerfAgent final
   friend class InspectorWebPerfAgentTest;
 
  public:
-  explicit InspectorWebPerfAgent(InspectedFrames*);
+  explicit InspectorWebPerfAgent(LocalFrame*);
   ~InspectorWebPerfAgent();
   DECLARE_VIRTUAL_TRACE();
 
@@ -52,7 +52,7 @@ class CORE_EXPORT InspectorWebPerfAgent final
       const HeapHashSet<Member<Location>>& frameContextLocations,
       Frame* rootFrame);
 
-  Member<InspectedFrames> m_inspectedFrames;
+  Member<LocalFrame> m_localFrame;
   HeapHashSet<Member<Location>> m_frameContextLocations;
 };
 

third_party/WebKit/Source/core/inspector/InspectorWebPerfAgentTest.cpp

@@ -45,7 +45,7 @@ class InspectorWebPerfAgentTest : public ::testing::Test {
 void InspectorWebPerfAgentTest::SetUp() {
   m_pageHolder = DummyPageHolder::create(IntSize(800, 600));
   m_pageHolder->document().setURL(KURL(KURL(), "https://example.com/foo"));
-  m_agent = new InspectorWebPerfAgent(InspectedFrames::create(frame()));
+  m_agent = new InspectorWebPerfAgent(frame());
 
   // Create another dummy page holder and pretend this is the iframe.
   m_anotherPageHolder = DummyPageHolder::create(IntSize(400, 300));

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

@@ -86,8 +86,7 @@ PerformanceTiming* Performance::timing() const {
 
 void Performance::updateLongTaskInstrumentation() {
   if (hasObserverFor(PerformanceEntry::LongTask) && !m_longTaskInspectorAgent) {
-    m_longTaskInspectorAgent =
-        new InspectorWebPerfAgent(InspectedFrames::create(frame()));
+    m_longTaskInspectorAgent = new InspectorWebPerfAgent(frame());
     m_longTaskInspectorAgent->enable();
   } else if (!hasObserverFor(PerformanceEntry::LongTask) &&
              m_longTaskInspectorAgent) {