Index: third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
index 3609203d4b69af7d0ef0375603657efcfdb5d76f..b2577a4286afab7cfab5beb6f83f126df13c4adf 100644 |
--- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
@@ -84,8 +84,7 @@ |
#include "public/web/WebSettings.h" |
#include "web/DevToolsEmulator.h" |
#include "web/InspectorEmulationAgent.h" |
-#include "web/InspectorOverlay.h" |
-#include "web/InspectorRenderingAgent.h" |
+#include "web/InspectorOverlayAgent.h" |
#include "web/WebFrameWidgetImpl.h" |
#include "web/WebInputEventConversion.h" |
#include "web/WebLocalFrameImpl.h" |
@@ -233,11 +232,9 @@ ClientMessageLoopAdapter* ClientMessageLoopAdapter::instance_ = nullptr; |
WebDevToolsAgentImpl* WebDevToolsAgentImpl::Create( |
WebLocalFrameImpl* frame, |
WebDevToolsAgentClient* client) { |
- InspectorOverlay* overlay = new InspectorOverlay(frame); |
- |
if (!IsMainFrame(frame)) { |
WebDevToolsAgentImpl* agent = |
- new WebDevToolsAgentImpl(frame, client, overlay, false); |
+ new WebDevToolsAgentImpl(frame, client, false); |
if (frame->FrameWidget()) |
agent->LayerTreeViewChanged( |
ToWebFrameWidgetImpl(frame->FrameWidget())->LayerTreeView()); |
@@ -245,8 +242,7 @@ WebDevToolsAgentImpl* WebDevToolsAgentImpl::Create( |
} |
WebViewImpl* view = frame->ViewImpl(); |
- WebDevToolsAgentImpl* agent = |
- new WebDevToolsAgentImpl(frame, client, overlay, true); |
+ WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, true); |
agent->LayerTreeViewChanged(view->LayerTreeView()); |
return agent; |
} |
@@ -254,7 +250,6 @@ WebDevToolsAgentImpl* WebDevToolsAgentImpl::Create( |
WebDevToolsAgentImpl::WebDevToolsAgentImpl( |
WebLocalFrameImpl* web_local_frame_impl, |
WebDevToolsAgentClient* client, |
- InspectorOverlay* overlay, |
bool include_view_agents) |
: client_(client), |
web_local_frame_impl_(web_local_frame_impl), |
@@ -262,16 +257,15 @@ WebDevToolsAgentImpl::WebDevToolsAgentImpl( |
web_local_frame_impl_->GetFrame()->InstrumentingAgents()), |
resource_content_loader_(InspectorResourceContentLoader::Create( |
web_local_frame_impl_->GetFrame())), |
- overlay_(overlay), |
inspected_frames_( |
InspectedFrames::Create(web_local_frame_impl_->GetFrame())), |
resource_container_(new InspectorResourceContainer(inspected_frames_)), |
- dom_agent_(nullptr), |
page_agent_(nullptr), |
network_agent_(nullptr), |
layer_tree_agent_(nullptr), |
tracing_agent_(nullptr), |
trace_events_agent_(new InspectorTraceEvents()), |
+ overlay_agent_(nullptr), |
include_view_agents_(include_view_agents), |
layer_tree_id_(0) { |
DCHECK(IsMainThread()); |
@@ -287,15 +281,14 @@ DEFINE_TRACE(WebDevToolsAgentImpl) { |
visitor->Trace(web_local_frame_impl_); |
visitor->Trace(instrumenting_agents_); |
visitor->Trace(resource_content_loader_); |
- visitor->Trace(overlay_); |
visitor->Trace(inspected_frames_); |
visitor->Trace(resource_container_); |
- visitor->Trace(dom_agent_); |
visitor->Trace(page_agent_); |
visitor->Trace(network_agent_); |
visitor->Trace(layer_tree_agent_); |
visitor->Trace(tracing_agent_); |
visitor->Trace(trace_events_agent_); |
+ visitor->Trace(overlay_agent_); |
visitor->Trace(session_); |
} |
@@ -323,8 +316,7 @@ void WebDevToolsAgentImpl::InitializeSession(int session_id, |
main_thread_debugger->ContextGroupId(inspected_frames_->Root()), state); |
InspectorDOMAgent* dom_agent = new InspectorDOMAgent( |
- isolate, inspected_frames_.Get(), session_->V8Session(), overlay_.Get()); |
- dom_agent_ = dom_agent; |
+ isolate, inspected_frames_.Get(), session_->V8Session()); |
session_->Append(dom_agent); |
InspectorLayerTreeAgent* layer_tree_agent = |
@@ -338,7 +330,7 @@ void WebDevToolsAgentImpl::InitializeSession(int session_id, |
session_->Append(network_agent); |
InspectorCSSAgent* css_agent = InspectorCSSAgent::Create( |
- dom_agent_, inspected_frames_.Get(), network_agent_, |
+ dom_agent, inspected_frames_.Get(), network_agent_, |
resource_content_loader_.Get(), resource_container_.Get()); |
session_->Append(css_agent); |
@@ -362,8 +354,8 @@ void WebDevToolsAgentImpl::InitializeSession(int session_id, |
tracing_agent_ = tracing_agent; |
session_->Append(tracing_agent); |
- session_->Append(new InspectorDOMDebuggerAgent(isolate, dom_agent_, |
- session_->V8Session())); |
+ session_->Append( |
+ new InspectorDOMDebuggerAgent(isolate, dom_agent, session_->V8Session())); |
session_->Append(InspectorInputAgent::Create(inspected_frames_.Get())); |
@@ -380,6 +372,12 @@ void WebDevToolsAgentImpl::InitializeSession(int session_id, |
session_->Append( |
new DeviceOrientationInspectorAgent(inspected_frames_.Get())); |
+ InspectorOverlayAgent* overlay_agent = |
+ new InspectorOverlayAgent(web_local_frame_impl_, inspected_frames_.Get(), |
+ session_->V8Session(), dom_agent); |
+ overlay_agent_ = overlay_agent; |
+ session_->Append(overlay_agent); |
+ |
tracing_agent_->SetLayerTreeId(layer_tree_id_); |
network_agent_->SetHostId(host_id); |
@@ -388,33 +386,25 @@ void WebDevToolsAgentImpl::InitializeSession(int session_id, |
// during remote->local transition we cannot access mainFrameImpl() yet, so |
// we have to store the frame which will become the main frame later. |
session_->Append( |
- InspectorRenderingAgent::Create(web_local_frame_impl_, overlay_.Get())); |
- session_->Append( |
InspectorEmulationAgent::Create(web_local_frame_impl_, this)); |
// TODO(dgozman): migrate each of the following agents to frame once module |
// is ready. |
Page* page = web_local_frame_impl_->ViewImpl()->GetPage(); |
session_->Append(InspectorDatabaseAgent::Create(page)); |
- session_->Append(new InspectorAccessibilityAgent(page, dom_agent_)); |
+ session_->Append(new InspectorAccessibilityAgent(page, dom_agent)); |
session_->Append(InspectorDOMStorageAgent::Create(page)); |
session_->Append(InspectorCacheStorageAgent::Create()); |
} |
- if (overlay_) |
- overlay_->Init(session_->V8Session(), dom_agent_); |
- |
Platform::Current()->CurrentThread()->AddTaskObserver(this); |
} |
void WebDevToolsAgentImpl::DestroySession() { |
- if (overlay_) |
- overlay_->Clear(); |
- |
+ overlay_agent_.Clear(); |
tracing_agent_.Clear(); |
layer_tree_agent_.Clear(); |
network_agent_.Clear(); |
page_agent_.Clear(); |
- dom_agent_.Clear(); |
session_->Dispose(); |
session_.Clear(); |
@@ -497,13 +487,13 @@ void WebDevToolsAgentImpl::DisableTracing() { |
} |
void WebDevToolsAgentImpl::ShowReloadingBlanket() { |
- if (overlay_) |
- overlay_->ShowReloadingBlanket(); |
+ if (overlay_agent_) |
+ overlay_agent_->ShowReloadingBlanket(); |
} |
void WebDevToolsAgentImpl::HideReloadingBlanket() { |
- if (overlay_) |
- overlay_->HideReloadingBlanket(); |
+ if (overlay_agent_) |
+ overlay_agent_->HideReloadingBlanket(); |
} |
void WebDevToolsAgentImpl::SetCPUThrottlingRate(double rate) { |
@@ -537,7 +527,7 @@ void WebDevToolsAgentImpl::DispatchMessageFromFrontend(int session_id, |
void WebDevToolsAgentImpl::InspectElementAt( |
int session_id, |
const WebPoint& point_in_root_frame) { |
- if (!dom_agent_ || !session_ || session_->SessionId() != session_id) |
+ if (!overlay_agent_ || !session_ || session_->SessionId() != session_id) |
return; |
HitTestRequest::HitTestRequestType hit_type = |
HitTestRequest::kMove | HitTestRequest::kReadOnly | |
@@ -557,7 +547,7 @@ void WebDevToolsAgentImpl::InspectElementAt( |
Node* node = result.InnerNode(); |
if (!node && web_local_frame_impl_->GetFrame()->GetDocument()) |
node = web_local_frame_impl_->GetFrame()->GetDocument()->documentElement(); |
- dom_agent_->Inspect(node); |
+ overlay_agent_->Inspect(node); |
} |
void WebDevToolsAgentImpl::FailedToRequestDevTools() { |
@@ -574,19 +564,8 @@ void WebDevToolsAgentImpl::SendProtocolMessage(int session_id, |
} |
void WebDevToolsAgentImpl::PageLayoutInvalidated(bool resized) { |
- if (overlay_) |
- overlay_->PageLayoutInvalidated(resized); |
-} |
- |
-void WebDevToolsAgentImpl::ConfigureOverlay(bool suspended, |
- const String& message) { |
- if (!overlay_) |
- return; |
- overlay_->SetPausedInDebuggerMessage(message); |
- if (suspended) |
- overlay_->Suspend(); |
- else |
- overlay_->Resume(); |
+ if (overlay_agent_) |
+ overlay_agent_->PageLayoutInvalidated(resized); |
} |
void WebDevToolsAgentImpl::WaitForCreateWindow(LocalFrame* frame) { |
@@ -599,10 +578,10 @@ void WebDevToolsAgentImpl::WaitForCreateWindow(LocalFrame* frame) { |
WebString WebDevToolsAgentImpl::EvaluateInWebInspectorOverlay( |
const WebString& script) { |
- if (!overlay_) |
+ if (!overlay_agent_) |
return WebString(); |
- return overlay_->EvaluateInOverlayForTest(script); |
+ return overlay_agent_->EvaluateInOverlayForTest(script); |
} |
bool WebDevToolsAgentImpl::CacheDisabled() { |