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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 2226023003: Fix RenderView reuse issues after a pending RenderFrameHost dies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address feedback from creis@ and nasko@ Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 // ignored, so this is safe. 318 // ignored, so this is safe.
319 if (!GetProcess()->Init()) 319 if (!GetProcess()->Init())
320 return false; 320 return false;
321 DCHECK(GetProcess()->HasConnection()); 321 DCHECK(GetProcess()->HasConnection());
322 DCHECK(GetProcess()->GetBrowserContext()); 322 DCHECK(GetProcess()->GetBrowserContext());
323 CHECK(main_frame_routing_id_ != MSG_ROUTING_NONE || 323 CHECK(main_frame_routing_id_ != MSG_ROUTING_NONE ||
324 proxy_route_id != MSG_ROUTING_NONE); 324 proxy_route_id != MSG_ROUTING_NONE);
325 325
326 // We should not set both main_frame_routing_id_ and proxy_route_id. Log 326 // We should not set both main_frame_routing_id_ and proxy_route_id. Log
327 // cases that this happens (without crashing) to track down 327 // cases that this happens (without crashing) to track down
328 // https://crbug.com/574245. 328 // https://crbug.com/575245.
329 // TODO(creis): Remove this once we've found the cause. 329 // TODO(creis): Remove this once we've found the cause.
330 if (main_frame_routing_id_ != MSG_ROUTING_NONE && 330 if (main_frame_routing_id_ != MSG_ROUTING_NONE &&
331 proxy_route_id != MSG_ROUTING_NONE) 331 proxy_route_id != MSG_ROUTING_NONE)
332 base::debug::DumpWithoutCrashing(); 332 base::debug::DumpWithoutCrashing();
333 333
334 GetWidget()->set_renderer_initialized(true); 334 GetWidget()->set_renderer_initialized(true);
335 335
336 // Ensure the RenderView starts with a next_page_id larger than any existing 336 // Ensure the RenderView starts with a next_page_id larger than any existing
337 // page ID it might be asked to render. 337 // page ID it might be asked to render.
338 int32_t next_page_id = 1; 338 int32_t next_page_id = 1;
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after
1321 // Note: We are using the origin URL provided by the sender here. It may be 1321 // Note: We are using the origin URL provided by the sender here. It may be
1322 // different from the receiver's. 1322 // different from the receiver's.
1323 file_system_file.url = 1323 file_system_file.url =
1324 GURL(storage::GetIsolatedFileSystemRootURIString( 1324 GURL(storage::GetIsolatedFileSystemRootURIString(
1325 file_system_url.origin(), filesystem_id, std::string()) 1325 file_system_url.origin(), filesystem_id, std::string())
1326 .append(register_name)); 1326 .append(register_name));
1327 } 1327 }
1328 } 1328 }
1329 1329
1330 } // namespace content 1330 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/site_per_process_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698