Refactor InspectorWebPerfAgent: update lifecycle management to be per Local Frame root; replace hea…

third_party/WebKit/Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
@@ skipping 35 matching lines @@
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/Settings.h"
 #include "core/frame/VisualViewport.h"
 #include "core/html/HTMLFrameElementBase.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/input/EventHandler.h"
+#include "core/inspector/InspectedFrames.h"
 #include "core/inspector/InspectorInstrumentation.h"
+#include "core/inspector/InspectorWebPerfAgent.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/api/LayoutPartItem.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/loader/NavigationScheduler.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/FocusController.h"
@@ skipping 255 matching lines @@
 }
 
 LocalFrame::~LocalFrame() {
   // Verify that the FrameView has been cleared as part of detaching
   // the frame owner.
   ASSERT(!m_view);
 }
 
 DEFINE_TRACE(LocalFrame) {
   visitor->trace(m_instrumentingAgents);
+  visitor->trace(m_inspectorWebPerfAgent);
   visitor->trace(m_loader);
   visitor->trace(m_navigationScheduler);
   visitor->trace(m_view);
   visitor->trace(m_domWindow);
   visitor->trace(m_pagePopupOwner);
   visitor->trace(m_script);
   visitor->trace(m_editor);
   visitor->trace(m_spellChecker);
   visitor->trace(m_selection);
   visitor->trace(m_eventHandler);
@@ skipping 202 matching lines @@
 }
 
 bool LocalFrame::isCrossOriginSubframe() const {
   const SecurityOrigin* securityOrigin = securityContext()->getSecurityOrigin();
   Frame* top = tree().top();
   return top &&
          !securityOrigin->canAccess(
              top->securityContext()->getSecurityOrigin());
 }
 
+void LocalFrame::enableInspectorWebPerfAgent() {
+  m_inspectorWebPerfAgentObservers++;
+  if (!inspectorWebPerfAgent()->isEnabled())

[caseq, 2016/10/26 21:19:41]

can we perhaps get rid of enable/disable methods and just create the agent when
it's first enabled and nuke it when it's no longer needed?

[panicker, 2016/10/27 23:06:53]

It could be created and destroyed multiple times during the life of the
LocalFrame - is that  desirable?

+    inspectorWebPerfAgent()->enable();
+}
+
+void LocalFrame::disableInspectorWebPerfAgent() {
+  m_inspectorWebPerfAgentObservers--;
+  if (m_inspectorWebPerfAgentObservers == 0)
+    inspectorWebPerfAgent()->disable();
+}
+
 void LocalFrame::setPrinting(bool printing,
                              const FloatSize& pageSize,
                              const FloatSize& originalPageSize,
                              float maximumShrinkRatio) {
   // In setting printing, we should not validate resources already cached for
   // the document.  See https://bugs.webkit.org/show_bug.cgi?id=43704
   ResourceCacheValidationSuppressor validationSuppressor(document()->fetcher());
 
   document()->setPrinting(printing ? Document::Printing
                                    : Document::FinishingPrinting);
@@ skipping 293 matching lines @@
       m_editor(Editor::create(*this)),
       m_spellChecker(SpellChecker::create(*this)),
       m_selection(FrameSelection::create(this)),
       m_eventHandler(new EventHandler(this)),
       m_console(FrameConsole::create(*this)),
       m_inputMethodController(InputMethodController::create(*this)),
       m_navigationDisableCount(0),
       m_pageZoomFactor(parentPageZoomFactor(this)),
       m_textZoomFactor(parentTextZoomFactor(this)),
       m_inViewSourceMode(false),
+      m_inspectorWebPerfAgentObservers(false),

[caseq, 2016/10/26 21:19:41]

that's a fancy way to initialize an int :-)

[panicker, 2016/10/28 00:09:24]

:) not needed anymore

       m_interfaceProvider(interfaceProvider),
       m_interfaceRegistry(interfaceRegistry) {
-  if (isLocalRoot())
+  if (isLocalRoot()) {
     m_instrumentingAgents = new InstrumentingAgents();
-  else
+    m_inspectorWebPerfAgent =
+        new InspectorWebPerfAgent(InspectedFrames::create(this));
+  } else {
     m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
+  }
 }
 
 WebFrameScheduler* LocalFrame::frameScheduler() {
   return m_frameScheduler.get();
 }
 
 void LocalFrame::scheduleVisualUpdateUnlessThrottled() {
   if (shouldThrottleRendering())
     return;
   page()->animator().scheduleVisualUpdate(this);
@@ skipping 25 matching lines @@
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer() {
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Leave();
 }
 
 }  // namespace blink