Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1484)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2572573003: Remove old diagnostic crash reports. (Closed)
Patch Set: Preserve routing ID. Created 4 years 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
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 5007f28f5c19f40d05bae2cdb26a00a3940ca5de..6fab9010a1730a8dee70b36fd1480756f39dcd54 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -1732,20 +1732,13 @@ void RenderFrameImpl::OnSwapOut(
// the necessary cleanup has happened anyway), but it might be possible for
// it to return false without detaching. Catch any cases that the
// RenderView's main_render_frame_ isn't cleared below (whether swap returns
- // false or not), to track down https://crbug.com/575245.
+ // false or not).
bool success = frame_->swap(proxy->web_frame());
// For main frames, the swap should have cleared the RenderView's pointer to
// this frame.
- if (is_main_frame) {
- base::debug::SetCrashKeyValue("swapout_frame_id",
- base::IntToString(routing_id));
- base::debug::SetCrashKeyValue("swapout_proxy_id",
- base::IntToString(proxy->routing_id()));
- base::debug::SetCrashKeyValue(
- "swapout_view_id", base::IntToString(render_view->GetRoutingID()));
+ if (is_main_frame)
CHECK(!render_view->main_render_frame_);
- }
if (!success) {
// The swap can fail when the frame is detached during swap (this can
@@ -3556,7 +3549,6 @@ void RenderFrameImpl::didCommitProvisionalLoad(
if (!proxy)
return;
- int proxy_routing_id = proxy_routing_id_;
if (!proxy->web_frame()->swap(frame_))
return;
proxy_routing_id_ = MSG_ROUTING_NONE;
@@ -3566,19 +3558,6 @@ void RenderFrameImpl::didCommitProvisionalLoad(
// it needs to set RenderViewImpl's pointer for the main frame to itself
// and ensure RenderWidget is no longer in swapped out mode.
if (is_main_frame_) {
- // Debug cases of https://crbug.com/575245.
- base::debug::SetCrashKeyValue("commit_frame_id",
- base::IntToString(GetRoutingID()));
- base::debug::SetCrashKeyValue("commit_proxy_id",
- base::IntToString(proxy_routing_id));
- base::debug::SetCrashKeyValue(
- "commit_view_id", base::IntToString(render_view_->GetRoutingID()));
- if (render_view_->main_render_frame_) {
- base::debug::SetCrashKeyValue(
- "commit_main_render_frame_id",
- base::IntToString(
- render_view_->main_render_frame_->GetRoutingID()));
- }
CHECK(!render_view_->main_render_frame_);
render_view_->main_render_frame_ = this;
if (render_view_->is_swapped_out())

Powered by Google App Engine
This is Rietveld 408576698