Hide PopupZoomer when the container view or window loses focus

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipboardManager;
@@ skipping 503 matching lines @@
     @VisibleForTesting
     public AdapterInputConnection getInputConnectionForTest() {
         return mInputConnection;
     }
 
     private ImeAdapter createImeAdapter(Context context) {
         return new ImeAdapter(mInputMethodManagerWrapper,
                 new ImeAdapter.ImeAdapterDelegate() {
                     @Override
                     public void onImeEvent() {
-                        if (mPopupZoomer.isShowing()) {
-                            mPopupZoomer.hide(true);
-                        }
+                        mPopupZoomer.hide(true);
                         getContentViewClient().onImeEvent();
                         hideTextHandles();
                     }
 
                     @Override
                     public void onDismissInput() {
                         getContentViewClient().onImeStateChangeRequested(false);
                     }
 
                     @Override
@@ skipping 210 matching lines @@
             public boolean onLongPress(View v, MotionEvent e) {
                 if (mNativeContentViewCore != 0) {
                     nativeLongPress(mNativeContentViewCore, e.getEventTime(), e.getX(), e.getY());
                 }
                 return true;
             }
         };
         mPopupZoomer.setOnTapListener(listener);
     }
 
+    @VisibleForTesting
+    public void setPopupZoomerForTest(PopupZoomer popupZoomer) {
+        mPopupZoomer = popupZoomer;
+    }
+
     /**
      * Destroy the internal state of the ContentView. This method may only be
      * called after the ContentView has been removed from the view system. No
      * other methods may be called on this ContentView after this method has
      * been called.
      */
     public void destroy() {
         if (mNativeContentViewCore != 0) {
             nativeOnJavaContentViewCoreDestroyed(mNativeContentViewCore);
         }
@@ skipping 668 matching lines @@
     public ContentSettings getContentSettings() {
         return mContentSettings;
     }
 
     private void hidePopups() {
         mUnselectAllOnActionModeDismiss = true;
         hideSelectActionBar();
         hidePastePopup();
         hideSelectPopup();
         hideTextHandles();
+        mPopupZoomer.hide(false);
     }
 
     public void hideSelectActionBar() {
         if (mActionMode != null) {
             mActionMode.finish();
             mActionMode = null;
         }
     }
 
     public boolean isSelectActionBarShowing() {
@@ skipping 174 matching lines @@
      */
     public void selectWordAroundCaret() {
         assert mWebContents != null;
         mWebContents.selectWordAroundCaret();
     }
 
     /**
      * @see View#onWindowFocusChanged(boolean)
      */
     public void onWindowFocusChanged(boolean hasWindowFocus) {
-        if (!hasWindowFocus) resetGestureDetection();
+        if (!hasWindowFocus) {
+            resetGestureDetection();
+            mPopupZoomer.hide(false);

[jdduke (slow), 2014/08/21 14:46:41]

When is this method called (without onHide also being called)?

[raghu, 2014/08/21 16:12:32]

Acknowledged. Its not necessary after hiding the zoomer in |hidePopups| 

+        }
     }
 
     public void onFocusChanged(boolean gainFocus) {
         if (!gainFocus) {
             hideImeIfNeeded();
             cancelRequestToScrollFocusedEditableNodeIntoView();
             hidePastePopup();
             hideTextHandles();
+            mPopupZoomer.hide(false);

[jdduke (slow), 2014/08/21 14:46:41]

Just curious, is this a source of bugs? Is there harm in keeping it visible if
we lose focus (i.e., does it conflict with other behavior?)?

[raghu, 2014/08/21 16:12:32]

I didnt see any harm in keeping it visible, but I think the zoomer should hide
when the user is doing something else.

         }
         if (mNativeContentViewCore != 0) nativeSetFocus(mNativeContentViewCore, gainFocus);
     }
 
     /**
      * @see View#onKeyUp(int, KeyEvent)
      */
     public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (mPopupZoomer.isShowing() && keyCode == KeyEvent.KEYCODE_BACK) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {

[jdduke (slow), 2014/08/21 14:46:41]

Actually, this isn't quite right, as now we'll never forward BACK key events,
when we really only want to suppress them if it's visible. You should restore
the original code here.

[raghu, 2014/08/21 16:12:32]

Done. It was a mistake to overlook the return statement.

             mPopupZoomer.hide(true);
             return true;
         }
         return mContainerViewInternals.super_onKeyUp(keyCode, event);
     }
 
     /**
      * @see View#dispatchKeyEventPreIme(KeyEvent)
      */
     public boolean dispatchKeyEventPreIme(KeyEvent event) {
@@ skipping 1540 matching lines @@
     private native void nativeWasResized(long nativeContentViewCoreImpl);
 
     private native void nativeSetAccessibilityEnabled(
             long nativeContentViewCoreImpl, boolean enabled);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 }