commit babcb660760e7c85240e6bf43165c8c063d95715
author Derek Sollenberger <djsollen@google.com> Fri Oct 01 08:50:51 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 01 08:50:51 2010 -0700
tree bc5a73318e094dafdd3c1d201a5ba6eb63d07da1
parent 19e09bd6ef35000c0707ad316a841a7585565343
parent fa89c50ae7ca06b3a9c42ee8d4b8eea6567b5e2e

Merge "Ensure full screen plugin is dismissed when necessary."

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 7944807..fedb873 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1291,6 +1291,7 @@
     private void clearHelpers() {
         clearTextEntry();
         clearActionModes();
+        dismissFullScreenMode();
     }
 
     /**
@@ -4911,6 +4912,13 @@
         return mFullScreenHolder != null;
     }
 
+    private void dismissFullScreenMode() {
+        if (inFullScreenMode()) {
+            mFullScreenHolder.dismiss();
+            mFullScreenHolder = null;
+        }
+    }
+
     void onPinchToZoomAnimationStart() {
         // cancel the single touch handling
         cancelTouch();
@@ -6878,9 +6886,9 @@
                     View view = (View) msg.obj;
                     int npp = msg.arg1;
 
-                    if (mFullScreenHolder != null) {
+                    if (inFullScreenMode()) {
                         Log.w(LOGTAG, "Should not have another full screen.");
-                        mFullScreenHolder.dismiss();
+                        dismissFullScreenMode();
                     }
                     mFullScreenHolder = new PluginFullScreenHolder(WebView.this, npp);
                     mFullScreenHolder.setContentView(view);
@@ -6891,10 +6899,7 @@
                     break;
                 }
                 case HIDE_FULLSCREEN:
-                    if (inFullScreenMode()) {
-                        mFullScreenHolder.dismiss();
-                        mFullScreenHolder = null;
-                    }
+                    dismissFullScreenMode();
                     break;
 
                 case DOM_FOCUS_CHANGED: