content/browser/devtools/render_frame_devtools_agent_host.cc - Issue 1003263002: DevTools: support scopes and iframes when debugging service workers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/devtools/render_frame_devtools_agent_host.cc

Issue 1003263002: DevTools: support scopes and iframes when debugging service workers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebaselined Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/devtools/protocol/service_worker_handler.cc ('k') | content/browser/devtools/service_worker_devtools_agent_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/render_frame_devtools_agent_host.cc

diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc

index acc2a2736de427e9a98ac0ad3156087bda2f83c6..6e39506126931e8f368a34ff0b04284245b3e3b0 100644

--- a/content/browser/devtools/render_frame_devtools_agent_host.cc

+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc

@@ -159,7 +159,6 @@ RenderFrameDevToolsAgentHost::RenderFrameDevToolsAgentHost(RenderFrameHost* rfh)

dispatcher->SetServiceWorkerHandler(service_worker_handler_.get());

dispatcher->SetTracingHandler(tracing_handler_.get());

SetRenderFrameHost(rfh);

- service_worker_handler_->SetURL(rfh->GetLastCommittedURL());

g_instances.Get().push_back(this);

AddRef(); // Balanced in RenderFrameHostDestroyed.

DevToolsManager::GetInstance()->AgentHostChanged(this);

@@ -410,8 +409,7 @@ void RenderFrameDevToolsAgentHost::DidCommitProvisionalLoadForFrame(

RenderFrameHost* render_frame_host,

const GURL& url,

ui::PageTransition transition_type) {

- if (render_frame_host_ == render_frame_host)

- service_worker_handler_->SetURL(url);

+ service_worker_handler_->UpdateHosts();

}

void RenderFrameDevToolsAgentHost::Observe(int type,

@@ -437,7 +435,7 @@ void RenderFrameDevToolsAgentHost::SetRenderFrameHost(RenderFrameHost* rfh) {

input_handler_->SetRenderViewHost(rvh);

network_handler_->SetRenderViewHost(rvh);

page_handler_->SetRenderViewHost(rvh);

- service_worker_handler_->SetRenderFrameHost(rfh);

+ service_worker_handler_->SetRenderFrameHost(render_frame_host_);

registrar_.Add(

this,