diff options
| -rw-r--r-- | content/browser/android/content_view_core_impl.cc | 4 | ||||
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index 35b8e20..39fd2f5 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -1361,6 +1361,8 @@ jboolean ContentViewCoreImpl::IsRenderWidgetHostViewReady(JNIEnv* env, void ContentViewCoreImpl::ExitFullscreen(JNIEnv* env, jobject obj) { RenderViewHost* host = web_contents_->GetRenderViewHost(); + if (!host) + return; host->ExitFullscreen(); } @@ -1370,6 +1372,8 @@ void ContentViewCoreImpl::UpdateTopControlsState(JNIEnv* env, bool enable_showing, bool animate) { RenderViewHost* host = web_contents_->GetRenderViewHost(); + if (!host) + return; host->Send(new ViewMsg_UpdateTopControlsState(host->GetRoutingID(), enable_hiding, enable_showing, diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java index 7f0dc98..e4075f5 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java @@ -3039,7 +3039,7 @@ public class ContentViewCore * Inform WebKit that Fullscreen mode has been exited by the user. */ public void exitFullscreen() { - nativeExitFullscreen(mNativeContentViewCore); + if (mNativeContentViewCore != 0) nativeExitFullscreen(mNativeContentViewCore); } /** @@ -3051,7 +3051,10 @@ public class ContentViewCore */ public void updateTopControlsState(boolean enableHiding, boolean enableShowing, boolean animate) { - nativeUpdateTopControlsState(mNativeContentViewCore, enableHiding, enableShowing, animate); + if (mNativeContentViewCore != 0) { + nativeUpdateTopControlsState( + mNativeContentViewCore, enableHiding, enableShowing, animate); + } } /** |