Revert of [DevTools] Consolidate overlay-related functionality in Overlay domain

third_party/WebKit/Source/web/WebDevToolsAgentImpl.h

 /*
  * Copyright (C) 2010 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 #include "platform/wtf/Vector.h"
 #include "public/platform/WebSize.h"
 #include "public/platform/WebThread.h"
 #include "public/web/WebDevToolsAgent.h"
 #include "web/InspectorEmulationAgent.h"
 
 namespace blink {
 
 class GraphicsLayer;
 class InspectedFrames;
-class InspectorOverlayAgent;
+class InspectorOverlay;
 class InspectorResourceContainer;
 class InspectorResourceContentLoader;
 class InspectorTraceEvents;
 class LocalFrame;
 class WebDevToolsAgentClient;
 class WebLayerTreeView;
 class WebLocalFrameImpl;
 class WebString;
 
 class WebDevToolsAgentImpl final
     : public GarbageCollectedFinalized<WebDevToolsAgentImpl>,
       public WebDevToolsAgent,
       public InspectorEmulationAgent::Client,
       public InspectorTracingAgent::Client,
       public InspectorPageAgent::Client,
       public InspectorSession::Client,
       private WebThread::TaskObserver {
  public:
   static WebDevToolsAgentImpl* Create(WebLocalFrameImpl*,
                                       WebDevToolsAgentClient*);
   ~WebDevToolsAgentImpl() override;
   DECLARE_VIRTUAL_TRACE();
 
   void WillBeDestroyed();
   WebDevToolsAgentClient* Client() { return client_; }
-  InspectorOverlayAgent* OverlayAgent() const { return overlay_agent_.Get(); }
+  InspectorOverlay* Overlay() const { return overlay_.Get(); }
   void FlushProtocolNotifications();
 
   // Instrumentation from web/ layer.
   void DidCommitLoadForLocalFrame(LocalFrame*);
   void DidStartProvisionalLoad(LocalFrame*);
   bool ScreencastEnabled();
   void WillAddPageOverlay(const GraphicsLayer*);
   void DidRemovePageOverlay(const GraphicsLayer*);
   void LayerTreeViewChanged(WebLayerTreeView*);
   void RootLayerCleared();
@@ skipping 10 matching lines @@
                                   const WebString& method,
                                   const WebString& message) override;
   void InspectElementAt(int session_id, const WebPoint&) override;
   void FailedToRequestDevTools() override;
   WebString EvaluateInWebInspectorOverlay(const WebString& script) override;
   bool CacheDisabled() override;
 
  private:
   WebDevToolsAgentImpl(WebLocalFrameImpl*,
                        WebDevToolsAgentClient*,
+                       InspectorOverlay*,
                        bool include_view_agents);
 
   // InspectorTracingAgent::Client implementation.
   void EnableTracing(const WTF::String& category_filter) override;
   void DisableTracing() override;
   void ShowReloadingBlanket() override;
   void HideReloadingBlanket() override;
 
   // InspectorEmulationAgent::Client implementation.
   void SetCPUThrottlingRate(double) override;
 
   // InspectorPageAgent::Client implementation.
   void PageLayoutInvalidated(bool resized) override;
+  void ConfigureOverlay(bool suspended, const String& message) override;
   void WaitForCreateWindow(LocalFrame*) override;
 
   // InspectorSession::Client implementation.
   void SendProtocolMessage(int session_id,
                            int call_id,
                            const String& response,
                            const String& state) override;
 
   // WebThread::TaskObserver implementation.
   void WillProcessTask() override;
@@ skipping 10 matching lines @@
       int session_id,
       std::unique_ptr<WebDevToolsAgent::MessageDescriptor>);
 
   bool Attached() const { return session_.Get(); }
 
   WebDevToolsAgentClient* client_;
   Member<WebLocalFrameImpl> web_local_frame_impl_;
 
   Member<CoreProbeSink> instrumenting_agents_;
   Member<InspectorResourceContentLoader> resource_content_loader_;
+  Member<InspectorOverlay> overlay_;
   Member<InspectedFrames> inspected_frames_;
   Member<InspectorResourceContainer> resource_container_;
 
+  Member<InspectorDOMAgent> dom_agent_;
   Member<InspectorPageAgent> page_agent_;
   Member<InspectorNetworkAgent> network_agent_;
   Member<InspectorLayerTreeAgent> layer_tree_agent_;
   Member<InspectorTracingAgent> tracing_agent_;
   Member<InspectorTraceEvents> trace_events_agent_;
-  Member<InspectorOverlayAgent> overlay_agent_;
 
   Member<InspectorSession> session_;
   bool include_view_agents_;
   int layer_tree_id_;
 };
 
 }  // namespace blink
 
 #endif