Devtools: Move inspectMode logic from InspectorDomAgent to InspectorOverlayImpl

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 137 matching lines @@
             return false;
     }
     quad->setP1(FloatPoint(coordinates[0], coordinates[1]));
     quad->setP2(FloatPoint(coordinates[2], coordinates[3]));
     quad->setP3(FloatPoint(coordinates[4], coordinates[5]));
     quad->setP4(FloatPoint(coordinates[6], coordinates[7]));
 
     return true;
 }
 
-Node* hoveredNodeForPoint(LocalFrame* frame, const IntPoint& pointInRootFrame, bool ignorePointerEventsNone)
-{
-    HitTestRequest::HitTestRequestType hitType = HitTestRequest::Move | HitTestRequest::ReadOnly | HitTestRequest::AllowChildFrameContent;
-    if (ignorePointerEventsNone)
-        hitType |= HitTestRequest::IgnorePointerEventsNone;
-    HitTestRequest request(hitType);
-    HitTestResult result(request, frame->view()->rootFrameToContents(pointInRootFrame));
-    frame->contentLayoutObject()->hitTest(result);
-    Node* node = result.innerPossiblyPseudoNode();
-    while (node && node->nodeType() == Node::TEXT_NODE)
-        node = node->parentNode();
-    return node;
-}
-
-Node* hoveredNodeForEvent(LocalFrame* frame, const PlatformGestureEvent& event, bool ignorePointerEventsNone)
-{
-    return hoveredNodeForPoint(frame, event.position(), ignorePointerEventsNone);
-}
-
-Node* hoveredNodeForEvent(LocalFrame* frame, const PlatformMouseEvent& event, bool ignorePointerEventsNone)
-{
-    return hoveredNodeForPoint(frame, event.position(), ignorePointerEventsNone);
-}
-
-Node* hoveredNodeForEvent(LocalFrame* frame, const PlatformTouchEvent& event, bool ignorePointerEventsNone)
-{
-    const Vector<PlatformTouchPoint>& points = event.touchPoints();
-    if (!points.size())
-        return nullptr;
-    return hoveredNodeForPoint(frame, roundedIntPoint(points[0].pos()), ignorePointerEventsNone);
-}
-
 ScriptValue nodeAsScriptValue(ScriptState* scriptState, Node* node)
 {
     ScriptState::Scope scope(scriptState);
     v8::Isolate* isolate = scriptState->isolate();
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "nodeAsScriptValue", "InjectedScriptHost", scriptState->context()->Global(), isolate);
     if (!BindingSecurity::shouldAllowAccessToNode(isolate, node, exceptionState))
         return ScriptValue(scriptState, v8::Null(isolate));
     return ScriptValue(scriptState, toV8(node, scriptState->context()->Global(), isolate));
 }
 
@@ skipping 106 matching lines @@
 }
 
 InspectorDOMAgent::InspectorDOMAgent(InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, Client* client)
     : InspectorBaseAgent<InspectorDOMAgent, InspectorFrontend::DOM>("DOM")
     , m_pageAgent(pageAgent)
     , m_injectedScriptManager(injectedScriptManager)
     , m_client(client)
     , m_domListener(nullptr)
     , m_documentNodeToIdMap(adoptPtrWillBeNoop(new NodeToIdMap()))
     , m_lastNodeId(1)
-    , m_searchingForNode(NotSearching)
     , m_suppressAttributeModifiedEvent(false)
     , m_backendNodeIdToInspect(0)
 {
 }
 
 InspectorDOMAgent::~InspectorDOMAgent()
 {
 #if !ENABLE(OILPAN)
     setDocument(nullptr);
     ASSERT(m_searchingForNode == NotSearching);
@@ skipping 140 matching lines @@
     if (!node)
         return nullptr;
 
     if (!node->isElementNode()) {
         *errorString = "Node is not an Element";
         return nullptr;
     }
     return toElement(node);
 }
 
-static ShadowRoot* userAgentShadowRoot(Node* node)
+ShadowRoot* InspectorDOMAgent::userAgentShadowRoot(Node* node)

[dgozman, 2015/09/01 00:53:29]

// static

[sergeyv, 2015/09/01 03:41:20]

Done.

 {
     if (!node || !node->isInShadowTree())
         return nullptr;
 
     Node* candidate = node;
     while (candidate && !candidate->isShadowRoot())
         candidate = candidate->parentOrShadowHostNode();
     ASSERT(candidate);
     ShadowRoot* shadowRoot = toShadowRoot(candidate);
 
@@ skipping 629 matching lines @@
     nodeIds = TypeBuilder::Array<int>::create();
     for (int i = fromIndex; i < toIndex; ++i)
         nodeIds->addItem(pushNodePathToFrontend((it->value)[i].get()));
 }
 
 void InspectorDOMAgent::discardSearchResults(ErrorString*, const String& searchId)
 {
     m_searchResults.remove(searchId);
 }
 
-bool InspectorDOMAgent::handleMousePress()
-{
-    if (m_searchingForNode == NotSearching)
-        return false;
-
-    if (m_hoveredNodeForInspectMode) {
-        inspect(m_hoveredNodeForInspectMode.get());
-        m_hoveredNodeForInspectMode.clear();
-        return true;
-    }
-    return false;
-}
-
-bool InspectorDOMAgent::handleGestureEvent(LocalFrame* frame, const PlatformGestureEvent& event)
-{
-    if (m_searchingForNode == NotSearching || event.type() != PlatformEvent::GestureTap)
-        return false;
-    Node* node = hoveredNodeForEvent(frame, event, false);
-    if (node && m_inspectModeHighlightConfig) {
-        if (m_client)
-            m_client->highlightNode(node, 0 /* eventTarget */, *m_inspectModeHighlightConfig, false);
-        inspect(node);
-        return true;
-    }
-    return false;
-}
-
-bool InspectorDOMAgent::handleTouchEvent(LocalFrame* frame, const PlatformTouchEvent& event)
-{
-    if (m_searchingForNode == NotSearching)
-        return false;
-    Node* node = hoveredNodeForEvent(frame, event, false);
-    if (node && m_inspectModeHighlightConfig) {
-        if (m_client)
-            m_client->highlightNode(node, 0 /* eventTarget */, *m_inspectModeHighlightConfig, false);
-        inspect(node);
-        return true;
-    }
-    return false;
-}
 
 void InspectorDOMAgent::inspect(Node* inspectedNode)
 {
     if (!inspectedNode)
         return;
 
     Node* node = inspectedNode;
     while (node && !node->isElementNode() && !node->isDocumentNode() && !node->isDocumentFragment())
         node = node->parentOrShadowHostNode();
     if (!node)
         return;
 
     int backendNodeId = DOMNodeIds::idForNode(node);
     if (!frontend() || !enabled()) {
         m_backendNodeIdToInspect = backendNodeId;
         return;
     }
 
     frontend()->inspectNodeRequested(backendNodeId);
 }
 
-bool InspectorDOMAgent::handleMouseMove(LocalFrame* frame, const PlatformMouseEvent& event)
-{
-    if (m_searchingForNode == NotSearching)
-        return false;
-
-    if (!frame->view() || !frame->contentLayoutObject())
-        return true;
-    Node* node = hoveredNodeForEvent(frame, event, event.shiftKey());
-
-    // Do not highlight within user agent shadow root unless requested.
-    if (m_searchingForNode != SearchingForUAShadow) {
-        ShadowRoot* shadowRoot = userAgentShadowRoot(node);
-        if (shadowRoot)
-            node = shadowRoot->host();
-    }
-
-    // Shadow roots don't have boxes - use host element instead.
-    if (node && node->isShadowRoot())
-        node = node->parentOrShadowHostNode();
-
-    if (!node)
-        return true;
-
-    Node* eventTarget = event.shiftKey() ? hoveredNodeForEvent(frame, event, false) : nullptr;
-    if (eventTarget == node)
-        eventTarget = 0;
-
-    if (node && m_inspectModeHighlightConfig) {
-        m_hoveredNodeForInspectMode = node;
-        if (m_client)
-            m_client->highlightNode(node, eventTarget, *m_inspectModeHighlightConfig, event.ctrlKey() || event.metaKey());
-    }
-    return true;
-}
 
 void InspectorDOMAgent::setSearchingForNode(ErrorString* errorString, SearchMode searchMode, JSONObject* highlightInspectorObject)
 {
     // TODO(dgozman): move this to overlay.

[dgozman, 2015/09/01 00:53:29]

remove TODO

[sergeyv, 2015/09/01 03:41:20]

Done.

-    m_searchingForNode = searchMode;
     if (m_client)

[dgozman, 2015/09/01 00:53:29]

else errorString="...."

[sergeyv, 2015/09/01 03:41:20]

I'll do this in follow-ups, because we should check it everywhere.

-        m_client->setInspectModeEnabled(searchMode != NotSearching);
-    if (searchMode != NotSearching) {
-        m_inspectModeHighlightConfig = highlightConfigFromInspectorObject(errorString, highlightInspectorObject);
-    } else {
-        m_hoveredNodeForInspectMode.clear();
-        hideHighlight(errorString);
-    }
+        m_client->setSearchingForNode(searchMode, searchMode != NotSearching ? highlightConfigFromInspectorObject(errorString, highlightInspectorObject) : nullptr);
 }
 
 PassOwnPtr<InspectorHighlightConfig> InspectorDOMAgent::highlightConfigFromInspectorObject(ErrorString* errorString, JSONObject* highlightInspectorObject)
 {
     if (!highlightInspectorObject) {
         *errorString = "Internal error: highlight configuration parameter is missing";
         return nullptr;
     }
 
     OwnPtr<InspectorHighlightConfig> highlightConfig = adoptPtr(new InspectorHighlightConfig());
@@ skipping 1004 matching lines @@
     visitor->trace(m_injectedScriptManager);
 #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);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink