Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| index ed555cc02ee3902056d4e34ae76f00031fe416cf..38f825f38f1e5470c3dfeda232715f1c485371bc 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
| @@ -690,7 +690,7 @@ RenderWidgetHost* RenderWidgetHostViewAura::GetRenderWidgetHost() const { |
| } |
| void RenderWidgetHostViewAura::WasShown() { |
| - if (!host_->is_hidden()) |
| + if (!host_ || !host_->is_hidden()) |
| return; |
| host_->WasShown(); |
| if (framebuffer_holder_) |
| @@ -714,7 +714,7 @@ void RenderWidgetHostViewAura::WasShown() { |
| } |
| void RenderWidgetHostViewAura::WasHidden() { |
| - if (host_->is_hidden()) |
| + if (!host_ || host_->is_hidden()) |
| return; |
| host_->WasHidden(); |
| if (framebuffer_holder_) |
| @@ -961,10 +961,12 @@ bool RenderWidgetHostViewAura::IsSurfaceAvailableForCopy() const { |
| void RenderWidgetHostViewAura::Show() { |
| window_->Show(); |
| + WasShown(); |
|
no sievers
2013/09/19 19:49:08
I thought this somehow happened already when I fol
zturner
2013/09/19 20:46:45
The delegate is a RWHVA. So it goes into RWHVA::O
|
| } |
| void RenderWidgetHostViewAura::Hide() { |
| window_->Hide(); |
| + WasHidden(); |
| } |
| bool RenderWidgetHostViewAura::IsShowing() { |