Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_android.cc |
| diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
| index ae2806e715333df1cd7df7ec65186a8de7357c39..3b94566748f4d5fdbc9faa3fda6fb1f5194531fb 100644 |
| --- a/content/browser/renderer_host/render_widget_host_view_android.cc |
| +++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
| @@ -199,7 +199,7 @@ RenderWidgetHostViewAndroid::GetRenderWidgetHost() const { |
| } |
| void RenderWidgetHostViewAndroid::WasShown() { |
| - if (!host_->is_hidden()) |
| + if (!host_ || !host_->is_hidden()) |
|
piman
2013/09/20 16:51:30
host_ is only reset right before |this| is destroy
|
| return; |
| host_->WasShown(); |
| @@ -208,7 +208,7 @@ void RenderWidgetHostViewAndroid::WasShown() { |
| void RenderWidgetHostViewAndroid::WasHidden() { |
| RunAckCallbacks(); |
| - if (host_->is_hidden()) |
| + if (!host_ || host_->is_hidden()) |
| return; |
| // Inform the renderer that we are being hidden so it can reduce its resource |
| @@ -356,6 +356,8 @@ void RenderWidgetHostViewAndroid::Show() { |
| are_layers_attached_ = true; |
| AttachLayers(); |
| + |
| + WasShown(); |
| } |
| void RenderWidgetHostViewAndroid::Hide() { |
| @@ -364,6 +366,8 @@ void RenderWidgetHostViewAndroid::Hide() { |
| are_layers_attached_ = false; |
| RemoveLayers(); |
| + |
| + WasHidden(); |
| } |
| bool RenderWidgetHostViewAndroid::IsShowing() { |