Devtools: Move inspectMode logic from InspectorDomAgent to InspectorOverlayImpl

Source/web/InspectorOverlayImpl.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * 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
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 61 matching lines @@
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(InspectorOverlayImpl);
 public:
     static PassOwnPtrWillBeRawPtr<InspectorOverlayImpl> create(WebViewImpl* webViewImpl)
     {
         return adoptPtrWillBeNoop(new InspectorOverlayImpl(webViewImpl));
     }
 
     ~InspectorOverlayImpl() override;
     DECLARE_TRACE();
 
-    void init(InspectorCSSAgent*, InspectorDebuggerAgent*);
+    void init(InspectorCSSAgent*, InspectorDebuggerAgent*, InspectorDOMAgent*);
 
     void update();
     void clear();
     bool handleInputEvent(const WebInputEvent&);
     void layout();
     PageOverlay* pageOverlay() { return m_pageOverlay.get(); };
 
 private:
     explicit InspectorOverlayImpl(WebViewImpl*);
     class InspectorOverlayChromeClient;
     class InspectorPageOverlayDelegate;
 
     // InspectorOverlayHost::Listener implementation.
     void overlayResumed() override;
     void overlaySteppedOver() override;
     void overlayStartedPropertyChange(const String&) override;
     void overlayPropertyChanged(float) override;
     void overlayEndedPropertyChange() override;
 
     // InspectorProfilerAgent::Client implementation.
     void profilingStarted() override;
     void profilingStopped() override;
 
     // InspectorPageAgent::Client implementation.
     void pageLayoutInvalidated(bool resized) override;
     void setShowViewportSizeOnResize(bool show, bool showGrid) override;
     void setPausedInDebuggerMessage(const String*) override;
 
     // InspectorDOMAgent::Client implementation.
-    void setInspectModeEnabled(bool) override;
     void hideHighlight() override;
     void highlightNode(Node*, Node* eventTarget, const InspectorHighlightConfig&, bool omitTooltip) override;
     void highlightQuad(PassOwnPtr<FloatQuad>, const InspectorHighlightConfig&) override;
+    void setSearchingForNode(InspectorDOMAgent::SearchMode, PassOwnPtr<InspectorHighlightConfig>) override;

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

setInspectMode(InspectorDOMAgent::InspectMode, ..)

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

Done.

 
     bool isEmpty();
     void drawNodeHighlight();
     void drawQuadHighlight();
     void drawPausedInDebuggerMessage();
     void drawViewSize();
 
     Page* overlayPage();
     LocalFrame* overlayMainFrame();
     void reset(const IntSize& viewportSize, const IntPoint& documentScrollOffset);
     void evaluateInOverlay(const String& method, const String& argument);
     void evaluateInOverlay(const String& method, PassRefPtr<JSONValue> argument);
     void onTimer(Timer<InspectorOverlayImpl>*);
     void rebuildOverlayPage();
     void invalidate();
 
+    bool handleMousePress();
+    bool handleGestureEvent(LocalFrame*, const PlatformGestureEvent&);
+    bool handleTouchEvent(LocalFrame*, const PlatformTouchEvent&);
+    bool handleMouseMove(LocalFrame*, const PlatformMouseEvent&);
+
     WebViewImpl* m_webViewImpl;
     String m_pausedInDebuggerMessage;
-    bool m_inspectModeEnabled;
     RefPtrWillBeMember<Node> m_highlightNode;
     RefPtrWillBeMember<Node> m_eventTargetNode;
     InspectorHighlightConfig m_nodeHighlightConfig;
     OwnPtr<FloatQuad> m_highlightQuad;
     OwnPtrWillBeMember<Page> m_overlayPage;
     OwnPtrWillBeMember<InspectorOverlayChromeClient> m_overlayChromeClient;
     RefPtrWillBeMember<InspectorOverlayHost> m_overlayHost;
     InspectorHighlightConfig m_quadHighlightConfig;
     bool m_drawViewSize;
     bool m_drawViewSizeWithGrid;
     bool m_resizeTimerActive;
     bool m_omitTooltip;
     Timer<InspectorOverlayImpl> m_timer;
     int m_suspendCount;
     bool m_inLayout;
     bool m_needsUpdate;
     RawPtrWillBeMember<InspectorDebuggerAgent> m_debuggerAgent;
+    RawPtrWillBeMember<InspectorDOMAgent> m_domAgent;
     OwnPtrWillBeMember<LayoutEditor> m_layoutEditor;
     OwnPtr<PageOverlay> m_pageOverlay;
+    RefPtrWillBeMember<Node> m_hoveredNodeForInspectMode;
+    InspectorDOMAgent::SearchMode m_searchingForNode;

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

m_inspectMode

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

Done.

+    OwnPtr<InspectorHighlightConfig> m_inspectModeHighlightConfig;
 };
 
 } // namespace blink
 
 
 #endif // InspectorOverlayImpl_h