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

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.cc

Issue 1308623003: Assume crashed RenderWidgetHost to be invisible (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Assume dead RenderWidgetHost to be invisible Created 5 years, 3 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/frame_host/render_frame_host_manager.h" 5 #include "content/browser/frame_host/render_frame_host_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 frame_tree_node_->IsMainFrame())) 420 frame_tree_node_->IsMainFrame()))
421 return nullptr; 421 return nullptr;
422 422
423 // Now that we've created a new renderer, be sure to hide it if it isn't 423 // Now that we've created a new renderer, be sure to hide it if it isn't
424 // our primary one. Otherwise, we might crash if we try to call Show() 424 // our primary one. Otherwise, we might crash if we try to call Show()
425 // on it later. 425 // on it later.
426 if (dest_render_frame_host != render_frame_host_) { 426 if (dest_render_frame_host != render_frame_host_) {
427 if (dest_render_frame_host->GetView()) 427 if (dest_render_frame_host->GetView())
428 dest_render_frame_host->GetView()->Hide(); 428 dest_render_frame_host->GetView()->Hide();
429 } else { 429 } else {
430 #if defined(OS_ANDROID)
no sievers 2015/09/01 18:30:54 Can we remove the ifdef Android? There shouldn't b
Jaekyun Seok (inactive) 2015/09/02 01:25:49 Removed. I tested on AURA Linux manually, and con
431 if (dest_render_frame_host->GetView()) {
432 if (dest_render_frame_host->GetView()->IsShowing() ==
433 delegate_->IsHidden()) {
434 if (delegate_->IsHidden())
435 dest_render_frame_host->GetView()->Hide();
436 else
437 dest_render_frame_host->GetView()->Show();
438 }
439 }
440 #endif
430 // TODO(nasko): This is a very ugly hack. The Chrome extensions process 441 // TODO(nasko): This is a very ugly hack. The Chrome extensions process
431 // manager still uses NotificationService and expects to see a 442 // manager still uses NotificationService and expects to see a
432 // RenderViewHost changed notification after WebContents and 443 // RenderViewHost changed notification after WebContents and
433 // RenderFrameHostManager are completely initialized. This should be 444 // RenderFrameHostManager are completely initialized. This should be
434 // removed once the process manager moves away from NotificationService. 445 // removed once the process manager moves away from NotificationService.
435 // See https://crbug.com/462682. 446 // See https://crbug.com/462682.
436 delegate_->NotifyMainFrameSwappedFromRenderManager( 447 delegate_->NotifyMainFrameSwappedFromRenderManager(
437 nullptr, render_frame_host_->render_view_host()); 448 nullptr, render_frame_host_->render_view_host());
438 } 449 }
439 } 450 }
(...skipping 2121 matching lines...) Expand 10 before | Expand all | Expand 10 after
2561 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) { 2572 int RenderFrameHostManager::GetOpenerRoutingID(SiteInstance* instance) {
2562 if (!frame_tree_node_->opener()) 2573 if (!frame_tree_node_->opener())
2563 return MSG_ROUTING_NONE; 2574 return MSG_ROUTING_NONE;
2564 2575
2565 return frame_tree_node_->opener() 2576 return frame_tree_node_->opener()
2566 ->render_manager() 2577 ->render_manager()
2567 ->GetRoutingIdForSiteInstance(instance); 2578 ->GetRoutingIdForSiteInstance(instance);
2568 } 2579 }
2569 2580
2570 } // namespace content 2581 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698