DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones.

Source/core/inspector/InspectorDOMAgent.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 265 matching lines @@
 }
 
 void InspectorDOMAgent::setFrontend(InspectorFrontend* frontend)
 {
     ASSERT(!m_frontend);
     m_history = adoptPtrWillBeNoop(new InspectorHistory());
     m_domEditor = adoptPtrWillBeNoop(new DOMEditor(m_history.get()));
 
     m_frontend = frontend->dom();
     m_instrumentingAgents->setInspectorDOMAgent(this);
-    m_document = m_pageAgent->mainFrame()->document();
+    m_document = m_pageAgent->inspectedFrame()->document();
 }
 
 void InspectorDOMAgent::clearFrontend()
 {
     ASSERT(m_frontend);
 
     m_history.clear();
     m_domEditor.clear();
 
     ErrorString error;
@@ skipping 228 matching lines @@
         return nullptr;
     }
 
     return element;
 }
 
 void InspectorDOMAgent::innerEnable()
 {
     m_state->setBoolean(DOMAgentState::domAgentEnabled, true);
     m_document = nullptr;
-    setDocument(m_pageAgent->mainFrame()->document());
+    setDocument(m_pageAgent->inspectedFrame()->document());
     if (m_listener)
         m_listener->domAgentWasEnabled();
 }
 
 void InspectorDOMAgent::enable(ErrorString*)
 {
     if (enabled())
         return;
     innerEnable();
 }
@@ skipping 1347 matching lines @@
 }
 
 bool InspectorDOMAgent::isWhitespace(Node* node)
 {
     //TODO: pull ignoreWhitespace setting from the frontend and use here.
     return node && node->nodeType() == Node::TEXT_NODE && node->nodeValue().stripWhiteSpace().length() == 0;
 }
 
 void InspectorDOMAgent::domContentLoadedEventFired(LocalFrame* frame)
 {
-    if (!frame->isMainFrame())
+    if (frame != m_pageAgent->inspectedFrame())
         return;
 
     // Re-push document once it is loaded.
     discardFrontendBindings();
     if (enabled())
         m_frontend->documentUpdated();
 }
 
 void InspectorDOMAgent::invalidateFrameOwnerElement(LocalFrame* frame)
 {
     HTMLFrameOwnerElement* frameOwner = frame->document()->ownerElement();
     if (!frameOwner)
         return;
 
     int frameOwnerId = m_documentNodeToIdMap->get(frameOwner);
     if (!frameOwnerId)
         return;
 
     // Re-add frame owner element together with its new children.
     int parentId = m_documentNodeToIdMap->get(innerParentNode(frameOwner));
     m_frontend->childNodeRemoved(parentId, frameOwnerId);
     unbind(frameOwner, m_documentNodeToIdMap.get());
 
     RefPtr<TypeBuilder::DOM::Node> value = buildObjectForNode(frameOwner, 0, m_documentNodeToIdMap.get());
     Node* previousSibling = innerPreviousSibling(frameOwner);
     int prevId = previousSibling ? m_documentNodeToIdMap->get(previousSibling) : 0;
     m_frontend->childNodeInserted(parentId, prevId, value.release());
 }
 
-void InspectorDOMAgent::didCommitLoad(LocalFrame* frame, DocumentLoader* loader)
+void InspectorDOMAgent::didCommitLoad(LocalFrame*, DocumentLoader* loader)
 {
-    // FIXME: If "frame" is always guarenteed to be in the same Page as loader->frame()
-    // then all we need to check here is loader->frame()->isMainFrame()
-    // and we don't need "frame" at all.
-    if (!frame->page()->mainFrame()->isLocalFrame())
-        return;
-    LocalFrame* mainFrame = frame->page()->deprecatedLocalMainFrame();
-    if (loader->frame() != mainFrame) {
+    LocalFrame* inspectedFrame = m_pageAgent->inspectedFrame();
+    if (loader->frame() != inspectedFrame) {
         invalidateFrameOwnerElement(loader->frame());
         return;
     }
 
-    setDocument(mainFrame->document());
+    setDocument(inspectedFrame->document());
 }
 
 void InspectorDOMAgent::didInsertDOMNode(Node* node)
 {
     if (isWhitespace(node))
         return;
 
     // We could be attaching existing subtree. Forget the bindings.
     unbind(node, m_documentNodeToIdMap.get());
 
@@ skipping 170 matching lines @@
         return;
     revalidateTask()->scheduleContentDistributionRevalidationFor(shadowHost);
 }
 
 void InspectorDOMAgent::frameDocumentUpdated(LocalFrame* frame)
 {
     Document* document = frame->document();
     if (!document)
         return;
 
-    Page* page = frame->page();
-    ASSERT(page);
-    if (frame != page->mainFrame())
+    if (frame != m_pageAgent->inspectedFrame())
         return;
 
     // Only update the main frame document, nested frame document updates are not required
     // (will be handled by invalidateFrameOwnerElement()).
     setDocument(document);
 }
 
 void InspectorDOMAgent::pseudoElementCreated(PseudoElement* pseudoElement)
 {
     Element* parent = pseudoElement->parentOrShadowHostElement();
@@ skipping 85 matching lines @@
     result = TypeBuilder::Array<int>::create();
     for (const auto& backendNode : *backendNodeIds) {
         int backendNodeId;
 
         if (!(backendNode)->asNumber(&backendNodeId)) {
             *errorString = "Invalid argument type";
             return;
         }
 
         Node* node = InspectorNodeIds::nodeForId(backendNodeId);
-        if (node && node->document().page() == m_pageAgent->page())
+        if (node && node->document().frame()->instrumentingAgents() == m_pageAgent->inspectedFrame()->instrumentingAgents())
             result->addItem(pushNodePathToFrontend(node));
         else
             result->addItem(0);
     }
 }
 
 void InspectorDOMAgent::getRelayoutBoundary(ErrorString* errorString, int nodeId, int* relayoutBoundaryNodeId)
 {
     Node* node = assertNode(errorString, nodeId);
     if (!node)
@@ skipping 47 matching lines @@
     visitor->trace(m_revalidateTask);
     visitor->trace(m_searchResults);
 #endif
     visitor->trace(m_history);
     visitor->trace(m_domEditor);
     visitor->trace(m_listener);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink