DevTools: support scopes and iframes when debugging service workers.

content/browser/devtools/render_frame_devtools_agent_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
 
 #include "base/basictypes.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 141 matching lines @@
   DevToolsProtocolDispatcher* dispatcher = protocol_handler_->dispatcher();
   dispatcher->SetDOMHandler(dom_handler_.get());
   dispatcher->SetInputHandler(input_handler_.get());
   dispatcher->SetInspectorHandler(inspector_handler_.get());
   dispatcher->SetNetworkHandler(network_handler_.get());
   dispatcher->SetPageHandler(page_handler_.get());
   dispatcher->SetPowerHandler(power_handler_.get());
   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);
 }
 
 BrowserContext* RenderFrameDevToolsAgentHost::GetBrowserContext() {
   WebContents* contents = web_contents();
   return contents ? contents->GetBrowserContext() : nullptr;
 }
 
@@ skipping 230 matching lines @@
 
 void RenderFrameDevToolsAgentHost::NavigationEntryCommitted(
     const LoadCommittedDetails& load_details) {
   DevToolsManager::GetInstance()->AgentHostChanged(this);
 }
 
 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_->UpdateURLs();
 }
 
 void RenderFrameDevToolsAgentHost::Observe(int type,
                                           const NotificationSource& source,
                                           const NotificationDetails& details) {
   if (type == content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED) {
     bool visible = *Details<bool>(details).ptr();
     page_handler_->OnVisibilityChanged(visible);
   }
 }
 
 void RenderFrameDevToolsAgentHost::SetRenderFrameHost(RenderFrameHost* rfh) {
   DCHECK(!render_frame_host_);
   render_frame_host_ = static_cast<RenderFrameHostImpl*>(rfh);
   // TODO(dgozman): here we should DCHECK that frame host is either root or
   // cross process subframe, but this requires handling cross-process
   // navigation. See http://crbug.com/464993.
 
   WebContentsObserver::Observe(WebContents::FromRenderFrameHost(rfh));
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
       rfh->GetRenderViewHost());
   dom_handler_->SetRenderViewHost(rvh);
   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,
       content::NOTIFICATION_RENDER_WIDGET_VISIBILITY_CHANGED,
       content::Source<RenderWidgetHost>(rvh));
 }
 
 void RenderFrameDevToolsAgentHost::ClearRenderFrameHost() {
   DCHECK(render_frame_host_);
   RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
@@ skipping 106 matching lines @@
   if (!IsAttached() || !render_frame_host_)
     return;
   SendMessageToClient(message);
 }
 
 bool RenderFrameDevToolsAgentHost::IsChildFrame() {
   return render_frame_host_ && render_frame_host_->GetParent();
 }
 
 }  // namespace content