DevTools: remove dependency of most agents on InspectorPageAgent

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 54 matching lines @@
 #include "core/inspector/DOMEditor.h"
 #include "core/inspector/DOMPatchSupport.h"
 #include "core/inspector/EventListenerInfo.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InjectedScriptHost.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/InspectorHighlight.h"
 #include "core/inspector/InspectorHistory.h"
 #include "core/inspector/InspectorIdentifiers.h"
 #include "core/inspector/InspectorOverlay.h"
-#include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InspectorState.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/LayoutView.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/page/FrameTree.h"
 #include "core/page/Page.h"
 #include "core/xml/DocumentXPathEvaluator.h"
 #include "core/xml/XPathResult.h"
 #include "platform/PlatformGestureEvent.h"
@@ skipping 199 matching lines @@
         *type = TypeBuilder::DOM::PseudoType::Resizer;
         return true;
     case INPUT_LIST_BUTTON:
         *type = TypeBuilder::DOM::PseudoType::Input_list_button;
         return true;
     default:
         return false;
     }
 }
 
-InspectorDOMAgent::InspectorDOMAgent(InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
+InspectorDOMAgent::InspectorDOMAgent(LocalFrame* inspectedFrame, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay)
     : InspectorBaseAgent<InspectorDOMAgent, InspectorFrontend::DOM>("DOM")
-    , m_pageAgent(pageAgent)
+    , m_inspectedFrame(inspectedFrame)
     , m_injectedScriptManager(injectedScriptManager)
     , m_overlay(overlay)
     , m_domListener(nullptr)
     , m_documentNodeToIdMap(adoptPtrWillBeNoop(new NodeToIdMap()))
     , m_lastNodeId(1)
     , m_searchingForNode(NotSearching)
     , m_suppressAttributeModifiedEvent(false)
     , m_listener(nullptr)
     , m_backendNodeIdToInspect(0)
 {
@@ skipping 222 matching lines @@
     }
 
     return element;
 }
 
 void InspectorDOMAgent::innerEnable()
 {
     m_state->setBoolean(DOMAgentState::domAgentEnabled, true);
     m_history = adoptPtrWillBeNoop(new InspectorHistory());
     m_domEditor = adoptPtrWillBeNoop(new DOMEditor(m_history.get()));
-    m_document = m_pageAgent->inspectedFrame()->document();
+    m_document = m_inspectedFrame->document();
     m_instrumentingAgents->setInspectorDOMAgent(this);
     if (m_listener)
         m_listener->domAgentWasEnabled();
     if (m_backendNodeIdToInspect)
         frontend()->inspectNodeRequested(m_backendNodeIdToInspect);
     m_backendNodeIdToInspect = 0;
 }
 
 void InspectorDOMAgent::enable(ErrorString*)
 {
@@ skipping 774 matching lines @@
         return;
 
     OwnPtr<InspectorHighlightConfig> highlightConfig = highlightConfigFromInspectorObject(errorString, highlightInspectorObject.get());
     if (!highlightConfig)
         return;
 
     m_overlay->highlightNode(node, 0 /* eventTarget */, *highlightConfig, false);
 }
 
 void InspectorDOMAgent::highlightFrame(
-    ErrorString*,
+    ErrorString* errorString,
     const String& frameId,
     const RefPtr<JSONObject>* color,
     const RefPtr<JSONObject>* outlineColor)
 {
-    LocalFrame* frame = m_pageAgent->frameForId(frameId);
-    // FIXME: Inspector doesn't currently work cross process.

[yurys, 2015/04/24 08:54:40]

Please return this.

-    if (frame && frame->deprecatedLocalOwner()) {
-        OwnPtr<InspectorHighlightConfig> highlightConfig = adoptPtr(new InspectorHighlightConfig());
-        highlightConfig->showInfo = true; // Always show tooltips for frames.
-        highlightConfig->content = parseColor(color);
-        highlightConfig->contentOutline = parseColor(outlineColor);
-        m_overlay->highlightNode(frame->deprecatedLocalOwner(), 0 /* eventTarget */, *highlightConfig, false);
+    LocalFrame* frame = InspectorIdentifiers<LocalFrame>::lookup(frameId);
+    if (!frame || frame->instrumentingAgents() != m_inspectedFrame->instrumentingAgents()) {
+        *errorString = "No frame for given id found";
+        return;
     }
+    FrameOwner* owner = frame->owner();
+    if (!owner || !owner->isLocal())
+        return;
+    HTMLFrameOwnerElement* ownerElement = toHTMLFrameOwnerElement(owner);
+    OwnPtr<InspectorHighlightConfig> highlightConfig = adoptPtr(new InspectorHighlightConfig());
+    highlightConfig->showInfo = true; // Always show tooltips for frames.
+    highlightConfig->content = parseColor(color);
+    highlightConfig->contentOutline = parseColor(outlineColor);
+    m_overlay->highlightNode(ownerElement, 0 /* eventTarget */, *highlightConfig, false);
 }
 
 void InspectorDOMAgent::hideHighlight(ErrorString*)
 {
     m_overlay->hideHighlight();
 }
 
 void InspectorDOMAgent::copyTo(ErrorString* errorString, int nodeId, int targetElementId, const int* const anchorNodeId, int* newNodeId)
 {
     Node* node = assertEditableNode(errorString, nodeId);
@@ skipping 450 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 != m_pageAgent->inspectedFrame())
+    if (frame != m_inspectedFrame)
         return;
 
     // Re-push document once it is loaded.
     discardFrontendBindings();
     if (enabled())
         frontend()->documentUpdated();
 }
 
 void InspectorDOMAgent::invalidateFrameOwnerElement(LocalFrame* frame)
 {
@@ skipping 11 matching lines @@
     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;
     frontend()->childNodeInserted(parentId, prevId, value.release());
 }
 
 void InspectorDOMAgent::didCommitLoad(LocalFrame*, DocumentLoader* loader)
 {
-    LocalFrame* inspectedFrame = m_pageAgent->inspectedFrame();
-    if (loader->frame() != inspectedFrame) {
+    if (loader->frame() != m_inspectedFrame) {
         invalidateFrameOwnerElement(loader->frame());
         return;
     }
 
-    setDocument(inspectedFrame->document());
+    setDocument(m_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 164 matching lines @@
         }
     }
 }
 
 void InspectorDOMAgent::frameDocumentUpdated(LocalFrame* frame)
 {
     Document* document = frame->document();
     if (!document)
         return;
 
-    if (frame != m_pageAgent->inspectedFrame())
+    if (frame != m_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 = DOMNodeIds::nodeForId(backendNodeId);
-        if (node && node->document().frame() && node->document().frame()->instrumentingAgents() == m_pageAgent->inspectedFrame()->instrumentingAgents())
+        if (node && node->document().frame() && node->document().frame()->instrumentingAgents() == m_inspectedFrame->instrumentingAgents())
             result->addItem(pushNodePathToFrontend(node));
         else
             result->addItem(0);
     }
 }
 
 class InspectableNode final : public InjectedScriptHost::InspectableObject {
 public:
     explicit InspectableNode(Node* node) : m_node(node) { }
     virtual ScriptValue get(ScriptState* state) override
@@ skipping 57 matching lines @@
         RefPtr<TypeBuilder::DOM::Node> root;
         getDocument(errorString, root);
         return errorString->isEmpty();
     }
     return true;
 }
 
 DEFINE_TRACE(InspectorDOMAgent)
 {
     visitor->trace(m_domListener);
-    visitor->trace(m_pageAgent);
+    visitor->trace(m_inspectedFrame);
     visitor->trace(m_injectedScriptManager);
     visitor->trace(m_overlay);
 #if ENABLE(OILPAN)
     visitor->trace(m_documentNodeToIdMap);
     visitor->trace(m_danglingNodeToIdMaps);
     visitor->trace(m_idToNode);
     visitor->trace(m_idToNodesMap);
     visitor->trace(m_document);
     visitor->trace(m_revalidateTask);
     visitor->trace(m_searchResults);
 #endif
     visitor->trace(m_hoveredNodeForInspectMode);
     visitor->trace(m_history);
     visitor->trace(m_domEditor);
     visitor->trace(m_listener);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink