DevTools: Set up utility context earlier (prevent from crash).

webkit/glue/webdevtoolsagent_impl.cc

 // Copyright (c) 2009 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 "config.h"
 
 #include <string>
 
 #include "Document.h"
 #include "EventListener.h"
@@ skipping 117 matching lines @@
   }
 
   // We were attached prior to the page load -> init agents with Document.
   Document* doc;
   if (ready) {
     Page* page = web_view_impl_->page();
     doc = page->mainFrame()->document();
   } else {
     doc = NULL;
   }
-  debugger_agent_impl_->ResetUtilityContext(doc, &utility_context_);
   if (doc) {
+    // Do not clear utility context when document is being cleared -
+    // there still can be pending messages from the client that require
+    // context to be processed.
+    debugger_agent_impl_->ResetUtilityContext(doc, &utility_context_);
     InitDevToolsAgentHost();
+    if (!report_frame_navigate_url_.empty()) {
+      // This is a document from the first load, issue frame navigate
+      // scheduled in DidCommitLoadForFrame.
+      tools_agent_delegate_stub_->FrameNavigate(report_frame_navigate_url_);
+      report_frame_navigate_url_ = "";
+    }
   }
   dom_agent_impl_->SetDocument(doc);
 }
 
 void WebDevToolsAgentImpl::DidCommitLoadForFrame(
     WebViewImpl* webview,
     WebFrame* frame,
     bool is_new_navigation) {
   if (!attached_) {
     DisposeUtilityContext();
     return;
   }
   WebDataSource* ds = frame->GetDataSource();
   const WebURLRequest& request = ds->request();
   GURL url = ds->hasUnreachableURL() ?
       ds->unreachableURL() :
       request.url();
-  tools_agent_delegate_stub_->FrameNavigate(
-      url.possibly_invalid_spec(),
-      webview->GetMainFrame() == frame);
+  if (webview->GetMainFrame() == frame) {
+    // Schedule frame navigate event.
+    report_frame_navigate_url_ = url.possibly_invalid_spec();
+  }
   InspectorController* ic = webview->page()->inspectorController();
   // Unhide resources panel if necessary.
   tools_agent_delegate_stub_->SetResourcesPanelEnabled(
       ic->resourceTrackingEnabled());
 }
 
 void WebDevToolsAgentImpl::WindowObjectCleared(WebFrameImpl* webframe) {
   DebuggerAgentManager::SetHostId(webframe, host_id_);
 }
 
@@ skipping 154 matching lines @@
     const std::string& command,
     int caller_id) {
   DebuggerAgentManager::ExecuteDebuggerCommand(command, caller_id);
 }
 
 // static
 void WebDevToolsAgent::SetMessageLoopDispatchHandler(
     MessageLoopDispatchHandler handler) {
   DebuggerAgentManager::SetMessageLoopDispatchHandler(handler);
 }