Commit b69934e7 authored by jam@chromium.org's avatar jam@chromium.org

Temporary code to track down increase in renderer crashes.

Review URL: http://codereview.chromium.org/8418043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107858 0039d316-1c4b-4281-b951-d872f2087c98
parent b392f3fb
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "base/file_util.h" #include "base/file_util.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/string_number_conversions.h" // Temporary
#include "base/string_util.h" #include "base/string_util.h"
#include "base/time.h" #include "base/time.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
...@@ -13,6 +14,7 @@ ...@@ -13,6 +14,7 @@
#include "content/browser/browser_url_handler.h" #include "content/browser/browser_url_handler.h"
#include "content/browser/child_process_security_policy.h" #include "content/browser/child_process_security_policy.h"
#include "content/browser/in_process_webkit/session_storage_namespace.h" #include "content/browser/in_process_webkit/session_storage_namespace.h"
#include "content/browser/renderer_host/render_view_host.h" // Temporary
#include "content/browser/site_instance.h" #include "content/browser/site_instance.h"
#include "content/browser/tab_contents/interstitial_page.h" #include "content/browser/tab_contents/interstitial_page.h"
#include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/navigation_details.h"
...@@ -671,6 +673,24 @@ content::NavigationType NavigationController::ClassifyNavigation( ...@@ -671,6 +673,24 @@ content::NavigationType NavigationController::ClassifyNavigation(
// release builds. Instead, we'll kill the renderer process to be safe. // release builds. Instead, we'll kill the renderer process to be safe.
LOG(ERROR) << "terminating renderer for bad navigation: " << params.url; LOG(ERROR) << "terminating renderer for bad navigation: " << params.url;
UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_NC")); UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_NC"));
// Temporary code so we can get more information:
std::string temp = params.url.spec();;
temp.append("#");
temp.append(params.referrer.spec());
temp.append("#");
temp.append(base::IntToString(params.page_id));
for (int i = static_cast<int>(entries_.size()) - 1; i >= 0; --i) {
if (entries_[i]->site_instance() == tab_contents_->GetSiteInstance()) {
temp.append("#");
temp.append(base::IntToString(entries_[i]->page_id()));
}
}
GURL url(temp);
tab_contents_->render_view_host()->Send(new ViewMsg_TempCrashWithData(url));
return content::NAVIGATION_TYPE_NAV_IGNORE;
if (tab_contents_->GetSiteInstance()->HasProcess()) if (tab_contents_->GetSiteInstance()->HasProcess())
tab_contents_->GetSiteInstance()->GetProcess()->ReceivedBadMessage(); tab_contents_->GetSiteInstance()->GetProcess()->ReceivedBadMessage();
return content::NAVIGATION_TYPE_NAV_IGNORE; return content::NAVIGATION_TYPE_NAV_IGNORE;
......
...@@ -1149,6 +1149,11 @@ IPC_MESSAGE_ROUTED2(ViewMsg_SavePageAsMHTML, ...@@ -1149,6 +1149,11 @@ IPC_MESSAGE_ROUTED2(ViewMsg_SavePageAsMHTML,
// Exit fullscreen. // Exit fullscreen.
IPC_MESSAGE_ROUTED0(ViewMsg_ExitFullscreen) IPC_MESSAGE_ROUTED0(ViewMsg_ExitFullscreen)
// Temporary message to diagnose an unexpected condition in TabContents.
IPC_MESSAGE_CONTROL1(ViewMsg_TempCrashWithData,
GURL /* data */)
// Messages sent from the renderer to the browser. // Messages sent from the renderer to the browser.
// Sent by the renderer when it is creating a new window. The browser creates // Sent by the renderer when it is creating a new window. The browser creates
......
...@@ -663,6 +663,7 @@ bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { ...@@ -663,6 +663,7 @@ bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache) IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache)
IPC_MESSAGE_HANDLER(ViewMsg_NetworkStateChanged, OnNetworkStateChanged) IPC_MESSAGE_HANDLER(ViewMsg_NetworkStateChanged, OnNetworkStateChanged)
IPC_MESSAGE_HANDLER(DOMStorageMsg_Event, OnDOMStorageEvent) IPC_MESSAGE_HANDLER(DOMStorageMsg_Event, OnDOMStorageEvent)
IPC_MESSAGE_HANDLER(ViewMsg_TempCrashWithData, OnTempCrashWithData)
IPC_MESSAGE_UNHANDLED(handled = false) IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP() IPC_END_MESSAGE_MAP()
return handled; return handled;
...@@ -776,6 +777,11 @@ void RenderThreadImpl::OnNetworkStateChanged(bool online) { ...@@ -776,6 +777,11 @@ void RenderThreadImpl::OnNetworkStateChanged(bool online) {
WebNetworkStateNotifier::setOnLine(online); WebNetworkStateNotifier::setOnLine(online);
} }
void RenderThreadImpl::OnTempCrashWithData(const GURL& data) {
content::GetContentClient()->SetActiveURL(data);
CHECK(false);
}
scoped_refptr<base::MessageLoopProxy> scoped_refptr<base::MessageLoopProxy>
RenderThreadImpl::GetFileThreadMessageLoopProxy() { RenderThreadImpl::GetFileThreadMessageLoopProxy() {
DCHECK(message_loop() == MessageLoop::current()); DCHECK(message_loop() == MessageLoop::current());
......
...@@ -190,6 +190,7 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread, ...@@ -190,6 +190,7 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread,
void OnPurgePluginListCache(bool reload_pages); void OnPurgePluginListCache(bool reload_pages);
void OnNetworkStateChanged(bool online); void OnNetworkStateChanged(bool online);
void OnGetAccessibilityTree(); void OnGetAccessibilityTree();
void OnTempCrashWithData(const GURL& data);
// These objects live solely on the render thread. // These objects live solely on the render thread.
scoped_ptr<ScopedRunnableMethodFactory<RenderThreadImpl> > task_factory_; scoped_ptr<ScopedRunnableMethodFactory<RenderThreadImpl> > task_factory_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment