Introduce AnchoredPopupWindow and refactor TextBubble

Introduce a new AnchoredPopupWindow class, containing most of the logic
previously in TextBubble, and refactor TextBubble to use this new class.
Also introduces a ViewRectProvider that contains most of the logic
previously in ViewAnchoredTextBubble.

This lays the ground work for using AnchoredPopupWindow (with extra
positioning customization/logic) for ListMenuButton to work around a bug
in Android ListPopupWindow positioning introduced in Android N.

BUG=709522

Change-Id: Ie6364ddcbd7b84736650ad3df8d433e1a75be6b6
Reviewed-on: https://chromium-review.googlesource.com/884328
Commit-Queue: Theresa <twellington@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532012}

chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -127,11 +127,12 @@ import org.chromium.chrome.browser.util.IntentUtils;
 import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
 import org.chromium.chrome.browser.widget.OverviewListLayout;
 import org.chromium.chrome.browser.widget.ViewHighlighter;
+import org.chromium.chrome.browser.widget.ViewRectProvider;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.StateChangeReason;
 import org.chromium.chrome.browser.widget.bottomsheet.ChromeHomeIphMenuHeader;
 import org.chromium.chrome.browser.widget.emptybackground.EmptyBackgroundViewWrapper;
-import org.chromium.chrome.browser.widget.textbubble.ViewAnchoredTextBubble;
+import org.chromium.chrome.browser.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
@@ -928,9 +929,10 @@ public class ChromeTabbedActivity
             }
         }
 
-        ViewAnchoredTextBubble textBubble =
-                new ViewAnchoredTextBubble(this, getToolbarAnchorViewForDownloadHomeTextBubble(),
-                        R.string.iph_download_home_text, accessibilityStringId);
+        View anchorView = getToolbarAnchorViewForDownloadHomeTextBubble();
+        ViewRectProvider rectProvider = new ViewRectProvider(anchorView);
+        TextBubble textBubble = new TextBubble(this, anchorView, R.string.iph_download_home_text,
+                accessibilityStringId, rectProvider);
         textBubble.setDismissOnTouchInteraction(true);
         textBubble.addOnDismissListener(() -> mHandler.postDelayed(() -> {
             tracker.dismissed(FeatureConstants.DOWNLOAD_HOME_FEATURE);
@@ -944,7 +946,7 @@ public class ChromeTabbedActivity
 
         int yInsetPx =
                 getResources().getDimensionPixelOffset(R.dimen.text_bubble_menu_anchor_y_inset);
-        textBubble.setInsetPx(0, isChromeHomeExpandButtonEnabled ? yInsetPx : 0, 0,
+        rectProvider.setInsetPx(0, isChromeHomeExpandButtonEnabled ? yInsetPx : 0, 0,
                 FeatureUtilities.isChromeHomeEnabled() ? 0 : yInsetPx);
         textBubble.show();
     }

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchIPH.java

@@ -12,6 +12,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSearchPanel;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.widget.RectProvider;
 import org.chromium.chrome.browser.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
@@ -25,6 +26,7 @@ public class ContextualSearchIPH {
     private View mParentView;
     private ContextualSearchPanel mSearchPanel;
     private TextBubble mHelpBubble;
+    private RectProvider mRectProvider;
     private String mFeatureName;
     private boolean mIsShowing;
 
@@ -109,8 +111,9 @@ public class ContextualSearchIPH {
 
         assert stringId != 0;
         assert mHelpBubble == null;
-        mHelpBubble = new TextBubble(mParentView.getContext(), mParentView, stringId, stringId);
-        mHelpBubble.setAnchorRect(getHelpBubbleAnchorRect());
+        mRectProvider = new RectProvider(getHelpBubbleAnchorRect());
+        mHelpBubble = new TextBubble(
+                mParentView.getContext(), mParentView, stringId, stringId, mRectProvider);
 
         mHelpBubble.setDismissOnTouchInteraction(true);
         mHelpBubble.addOnDismissListener(() -> {
@@ -129,7 +132,7 @@ public class ContextualSearchIPH {
     void updateBubblePosition() {
         if (!mIsShowing || mHelpBubble == null || !mHelpBubble.isShowing()) return;
 
-        mHelpBubble.setAnchorRect(getHelpBubbleAnchorRect());
+        mRectProvider.setRect(getHelpBubbleAnchorRect());
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/infobar/IPHBubbleDelegateImpl.java

@@ -12,14 +12,14 @@ import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.infobar.IPHInfoBarSupport.PopupState;
 import org.chromium.chrome.browser.infobar.IPHInfoBarSupport.TrackerParameters;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.widget.textbubble.ViewAnchoredTextBubble;
+import org.chromium.chrome.browser.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
 
 /**
  * Default implementation of {@link IPHInfoBarSupport.IPHBubbleDelegate} that handles interacting
- * with {@link Tracker} and creating a {@link ViewAnchoredTextBubble} based on the type of infobar
+ * with {@link Tracker} and creating a {@link TextBubble} based on the type of infobar
  * shown.
  */
 class IPHBubbleDelegateImpl implements IPHInfoBarSupport.IPHBubbleDelegate {
@@ -42,8 +42,8 @@ class IPHBubbleDelegateImpl implements IPHInfoBarSupport.IPHBubbleDelegate {
         PopupState state = new PopupState();
         state.view = anchorView;
         state.feature = params.feature;
-        state.bubble = new ViewAnchoredTextBubble(
-                mContext, anchorView, params.textId, params.accessibilityTextId);
+        state.bubble = new TextBubble(
+                mContext, anchorView, params.textId, params.accessibilityTextId, anchorView);
         state.bubble.setDismissOnTouchInteraction(true);
 
         return state;

chrome/android/java/src/org/chromium/chrome/browser/infobar/IPHInfoBarSupport.java

@@ -103,7 +103,7 @@ class IPHInfoBarSupport implements OnDismissListener, InfoBarContainer.InfoBarAn
     @Override
     public void notifyAnimationFinished(int animationType) {}
 
-    // Calling {@link ViewAnchoredTextBubble#dismiss()} will invoke {@link #onDismiss} which will
+    // Calling {@link TextBubble#dismiss()} will invoke {@link #onDismiss} which will
     // set the value of {@link #mCurrentState} to null, which is what the assert checks. Since this
     // goes through the Android SDK, FindBugs does not see this as happening, so the FindBugs
     // warning for a field guaranteed to be non-null being checked for null equality needs to be
@@ -133,7 +133,7 @@ class IPHInfoBarSupport implements OnDismissListener, InfoBarContainer.InfoBarAn
     @Override
     public void onAddInfoBar(InfoBarContainer container, InfoBar infoBar, boolean isFirst) {}
 
-    // Calling {@link ViewAnchoredTextBubble#dismiss()} will invoke {@link #onDismiss} which will
+    // Calling {@link TextBubble#dismiss()} will invoke {@link #onDismiss} which will
     // set the value of {@link #mCurrentState} to null, which is what the assert checks. Since this
     // goes through the Android SDK, FindBugs does not see this as happening, so the FindBugs
     // warning for a field guaranteed to be non-null being checked for null equality needs to be

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

@@ -94,9 +94,10 @@ import org.chromium.chrome.browser.tabmodel.TabReparentingParams;
 import org.chromium.chrome.browser.util.ColorUtils;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.vr_shell.VrShellDelegate;
+import org.chromium.chrome.browser.widget.AnchoredPopupWindow;
 import org.chromium.chrome.browser.widget.PulseDrawable;
+import org.chromium.chrome.browser.widget.ViewRectProvider;
 import org.chromium.chrome.browser.widget.textbubble.TextBubble;
-import org.chromium.chrome.browser.widget.textbubble.ViewAnchoredTextBubble;
 import org.chromium.components.dom_distiller.core.DomDistillerUrlUtils;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
@@ -1731,10 +1732,11 @@ public class Tab
 
         if (!(getActivity() instanceof ChromeTabbedActivity)) return;
 
-        ViewAnchoredTextBubble textBubble = new ViewAnchoredTextBubble(getActivity(),
-                getActivity().getToolbarManager().getMenuButton(),
-                R.string.iph_data_saver_detail_text,
-                R.string.iph_data_saver_detail_accessibility_text);
+        View anchorView = getActivity().getToolbarManager().getMenuButton();
+        ViewRectProvider rectProvider = new ViewRectProvider(anchorView);
+        TextBubble textBubble =
+                new TextBubble(getActivity(), anchorView, R.string.iph_data_saver_detail_text,
+                        R.string.iph_data_saver_detail_accessibility_text, rectProvider);
         textBubble.setDismissOnTouchInteraction(true);
         getActivity().getAppMenuHandler().setMenuHighlight(R.id.app_menu_footer);
         textBubble.addOnDismissListener(new OnDismissListener() {
@@ -1751,7 +1753,7 @@ public class Tab
         });
         int yInsetPx = mThemedApplicationContext.getResources().getDimensionPixelOffset(
                 R.dimen.text_bubble_menu_anchor_y_inset);
-        textBubble.setInsetPx(0, FeatureUtilities.isChromeHomeEnabled() ? yInsetPx : 0, 0,
+        rectProvider.setInsetPx(0, FeatureUtilities.isChromeHomeEnabled() ? yInsetPx : 0, 0,
                 FeatureUtilities.isChromeHomeEnabled() ? 0 : yInsetPx);
         textBubble.show();
     }
@@ -3382,6 +3384,8 @@ public class Tab
 
     @CalledByNative
     private void showMediaDownloadInProductHelp(int x, int y, int width, int height) {
+        Rect rect = new Rect(x, y, x + width, y + height);
+
         // If we are not currently showing the widget, ask the tracker if we can show it.
         if (mDownloadIPHBubble == null) {
             Tracker tracker = TrackerFactory.getTrackerForProfile(Profile.getLastUsedProfile());
@@ -3395,7 +3399,7 @@ public class Tab
 
             mDownloadIPHBubble = new TextBubble(getApplicationContext(),
                     mContentViewCore.getContainerView(), R.string.iph_media_download_text,
-                    R.string.iph_media_download_accessibility_text);
+                    R.string.iph_media_download_accessibility_text, rect);
             mDownloadIPHBubble.setDismissOnTouchInteraction(true);
             mDownloadIPHBubble.addOnDismissListener(new OnDismissListener() {
                 @Override
@@ -3410,9 +3414,7 @@ public class Tab
             });
         }
 
-        Rect rect = new Rect(x, y, x + width, y + height);
-        mDownloadIPHBubble.setAnchorRect(rect);
-        mDownloadIPHBubble.setPreferredOrientation(TextBubble.Orientation.BELOW);
+        mDownloadIPHBubble.setPreferredOrientation(AnchoredPopupWindow.Orientation.BELOW);
         mDownloadIPHBubble.show();
         createPulse(rect);
     }

chrome/android/java/src/org/chromium/chrome/browser/toolbar/TabSwitcherCallout.java

@@ -12,8 +12,8 @@ import android.view.View;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.widget.ViewRectProvider;
 import org.chromium.chrome.browser.widget.textbubble.TextBubble;
-import org.chromium.chrome.browser.widget.textbubble.ViewAnchoredTextBubble;
 
 /**
  * Draws a bubble pointing upward at the tab switcher button.
@@ -37,12 +37,15 @@ public class TabSwitcherCallout {
         if (!isTabSwitcherCalloutNecessary()) return null;
         setIsTabSwitcherCalloutNecessary(false);
 
-        ViewAnchoredTextBubble bubble = new ViewAnchoredTextBubble(context, tabSwitcherButton,
-                R.string.tab_switcher_callout_body, R.string.tab_switcher_callout_body);
+        ViewRectProvider rectProvider = new ViewRectProvider(tabSwitcherButton);
+        int yInsetPx = (int) (Y_OVERLAP_DP * context.getResources().getDisplayMetrics().density);
+        rectProvider.setInsetPx(0, yInsetPx, 0, yInsetPx);
+
+        TextBubble bubble =
+                new TextBubble(context, tabSwitcherButton, R.string.tab_switcher_callout_body,
+                        R.string.tab_switcher_callout_body, rectProvider);
         bubble.setDismissOnTouchInteraction(true);
         bubble.setAutoDismissTimeout(TAB_SWITCHER_CALLOUT_DISMISS_MS);
-        int yInsetPx = (int) (Y_OVERLAP_DP * context.getResources().getDisplayMetrics().density);
-        bubble.setInsetPx(0, yInsetPx, 0, yInsetPx);
         bubble.show();
         return bubble;
     }

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

@@ -74,9 +74,10 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
 import org.chromium.chrome.browser.toolbar.ActionModeController.ActionBarDelegate;
 import org.chromium.chrome.browser.util.FeatureUtilities;
 import org.chromium.chrome.browser.widget.ViewHighlighter;
+import org.chromium.chrome.browser.widget.ViewRectProvider;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
 import org.chromium.chrome.browser.widget.findinpage.FindToolbarObserver;
-import org.chromium.chrome.browser.widget.textbubble.ViewAnchoredTextBubble;
+import org.chromium.chrome.browser.widget.textbubble.TextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
@@ -167,7 +168,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
 
     private AppMenuButtonHelper mAppMenuButtonHelper;
 
-    private ViewAnchoredTextBubble mTextBubble;
+    private TextBubble mTextBubble;
 
     private HomepageStateListener mHomepageStateListener;
 
@@ -611,9 +612,14 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
 
         if (!tracker.shouldTriggerHelpUI(featureName)) return;
 
-        mTextBubble = new ViewAnchoredTextBubble(mToolbar.getContext(), getMenuButton(),
+        ViewRectProvider rectProvider = new ViewRectProvider(getMenuButton());
+        int yInsetPx = mToolbar.getContext().getResources().getDimensionPixelOffset(
+                R.dimen.text_bubble_menu_anchor_y_inset);
+        rectProvider.setInsetPx(0, FeatureUtilities.isChromeHomeEnabled() ? yInsetPx : 0, 0,
+                FeatureUtilities.isChromeHomeEnabled() ? 0 : yInsetPx);
+        mTextBubble = new TextBubble(mToolbar.getContext(), getMenuButton(),
                 R.string.iph_download_page_for_offline_usage_text,
-                R.string.iph_download_page_for_offline_usage_accessibility_text);
+                R.string.iph_download_page_for_offline_usage_accessibility_text, rectProvider);
         mTextBubble.setDismissOnTouchInteraction(true);
         mTextBubble.addOnDismissListener(new OnDismissListener() {
             @Override
@@ -628,10 +634,6 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
             }
         });
         activity.getAppMenuHandler().setMenuHighlight(R.id.offline_page_id);
-        int yInsetPx = mToolbar.getContext().getResources().getDimensionPixelOffset(
-                R.dimen.text_bubble_menu_anchor_y_inset);
-        mTextBubble.setInsetPx(0, FeatureUtilities.isChromeHomeEnabled() ? yInsetPx : 0, 0,
-                FeatureUtilities.isChromeHomeEnabled() ? 0 : yInsetPx);
         mTextBubble.show();
     }
 

chrome/android/java/src/org/chromium/chrome/browser/widget/RectProvider.java

+// Copyright 2018 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.chrome.browser.widget;
+
+import android.graphics.Rect;
+
+/**
+ * Provides a {@link Rect} object that represents a position in screen space.
+ */
+public class RectProvider {
+    /** An observer to be notified of changes to the {@Rect} position. */
+    public interface Observer {
+        /**
+         * Called when the {@link Rect} location has changed. The new {@link Rect} can be retrieved
+         * using {@link #getRect()}.
+         */
+        void onRectChanged();
+
+        /** Called when the {@link Rect} is no longer visible. */
+        void onRectHidden();
+    }
+
+    /**
+     * The {@link Rect} provided by this provider. This is the Rect that will be passed to
+     * observers and returned from {@link #getRect()}.
+     */
+    protected final Rect mRect = new Rect();
+
+    private Observer mObserver;
+
+    /** Creates an instance of a {@link RectProvider}. */
+    public RectProvider() {}
+
+    /**
+     * Creates an instance of a {@link RectProvider}.
+     * @param rect The {@link Rect} to provide.
+     */
+    public RectProvider(Rect rect) {
+        mRect.set(rect);
+    }
+
+    /**
+     * Sets the {@link Rect} provided by this provider.
+     * @param rect The {@link Rect} to provide.
+     */
+    public void setRect(Rect rect) {
+        mRect.set(rect);
+        notifyRectChanged();
+    }
+
+    /**
+     * Start observing changes to the {@link Rect}'s position in the window. This does not guarantee
+     * an immediate call to observer methods. Use {@link #getRect()} to retrieve the {@link Rect}.
+     * @param observer The {@link Observer} to be notified of changes.
+     */
+    public void startObserving(Observer observer) {
+        assert mObserver == null || mObserver == observer;
+
+        mObserver = observer;
+    }
+
+    /**
+     * Stop observing changes to the {@link Rect}'s position in the window.
+     */
+    public void stopObserving() {
+        mObserver = null;
+    }
+
+    /** @return The {@link Rect} that this provider represents. */
+    public Rect getRect() {
+        return mRect;
+    }
+
+    /** Notify the observer that the {@link Rect} changed. */
+    protected void notifyRectChanged() {
+        if (mObserver != null) mObserver.onRectChanged();
+    }
+
+    /** Notify the observer that the {@link Rect} is hidden. */
+    protected void notifyRectHidden() {
+        if (mObserver != null) mObserver.onRectHidden();
+    }
+}

chrome/android/java/src/org/chromium/chrome/browser/widget/textbubble/ViewAnchoredTextBubble.java → chrome/android/java/src/org/chromium/chrome/browser/widget/ViewRectProvider.java

-// Copyright 2017 The Chromium Authors. All rights reserved.
+// Copyright 2018 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.chrome.browser.widget.textbubble;
+package org.chromium.chrome.browser.widget;
 
-import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.StringRes;
 import android.view.View;
 import android.view.ViewTreeObserver;
-import android.view.ViewTreeObserver.OnPreDrawListener;
-import android.widget.PopupWindow.OnDismissListener;
 
 import org.chromium.base.ApiCompatibilityUtils;
-import org.chromium.content.browser.PositionObserver;
-import org.chromium.content.browser.ViewPositionObserver;
 
 /**
- * A helper class that anchors a {@link TextBubble} to a particular {@link View}.  The bubble will
- * listen to layout events on the {@link View} and update accordingly.
+ * Provides a {@Rect} for the location of a {@View} in its window, see
+ * {@link View#getLocationOnScreen(int[])}.
  */
-public class ViewAnchoredTextBubble extends TextBubble
-        implements PositionObserver.Listener, ViewTreeObserver.OnGlobalLayoutListener,
-                   View.OnAttachStateChangeListener, OnPreDrawListener, OnDismissListener {
+public class ViewRectProvider extends RectProvider
+        implements ViewTreeObserver.OnGlobalLayoutListener, View.OnAttachStateChangeListener,
+                   ViewTreeObserver.OnPreDrawListener {
     private final int[] mCachedWindowCoordinates = new int[2];
-    private final Rect mAnchorRect = new Rect();
     private final Rect mInsetRect = new Rect();
-    private final View mAnchorView;
-
-    private final ViewPositionObserver mViewPositionObserver;
+    private final View mView;
 
     /** If not {@code null}, the {@link ViewTreeObserver} that we are registered to. */
     private ViewTreeObserver mViewTreeObserver;
 
     /**
-     * Creates an instance of a {@link ViewAnchoredTextBubble}.
-     * @param context    Context to draw resources from.
-     * @param anchorView The {@link View} to anchor to.
-     * @param stringId The id of the string resource for the text that should be shown.
-     * @param accessibilityStringId The id of the string resource of the accessibility text.
+     * Creates an instance of a {@link ViewRectProvider}.
+     * @param view The {@link View} used to generate a {@link Rect}.
      */
-    public ViewAnchoredTextBubble(Context context, View anchorView, @StringRes int stringId,
-            @StringRes int accessibilityStringId) {
-        super(context, anchorView.getRootView(), stringId, accessibilityStringId);
-        mAnchorView = anchorView;
-
-        mViewPositionObserver = new ViewPositionObserver(mAnchorView);
+    public ViewRectProvider(View view) {
+        mView = view;
+        mCachedWindowCoordinates[0] = -1;
+        mCachedWindowCoordinates[1] = -1;
     }
 
     /**
      * Specifies the inset values in pixels that determine how to shrink the {@link View} bounds
-     * when creating the anchor {@link Rect}.
+     * when creating the {@link Rect}.
      */
     public void setInsetPx(int left, int top, int right, int bottom) {
         mInsetRect.set(left, top, right, bottom);
-        refreshAnchorBounds();
+        refreshRectBounds();
     }
 
-    // TextBubble implementation.
     @Override
-    public void show() {
-        mViewPositionObserver.addListener(this);
-        mAnchorView.addOnAttachStateChangeListener(this);
-        mViewTreeObserver = mAnchorView.getViewTreeObserver();
+    public void startObserving(Observer observer) {
+        mView.addOnAttachStateChangeListener(this);
+        mViewTreeObserver = mView.getViewTreeObserver();
         mViewTreeObserver.addOnGlobalLayoutListener(this);
         mViewTreeObserver.addOnPreDrawListener(this);
 
-        refreshAnchorBounds();
-        super.show();
+        refreshRectBounds();
+
+        super.startObserving(observer);
     }
 
     @Override
-    public void onDismiss() {
-        mViewPositionObserver.removeListener(this);
-        mAnchorView.removeOnAttachStateChangeListener(this);
+    public void stopObserving() {
+        mView.removeOnAttachStateChangeListener(this);
 
         if (mViewTreeObserver != null && mViewTreeObserver.isAlive()) {
             mViewTreeObserver.removeOnGlobalLayoutListener(this);
             mViewTreeObserver.removeOnPreDrawListener(this);
         }
         mViewTreeObserver = null;
+
+        super.stopObserving();
     }
 
     // ViewTreeObserver.OnGlobalLayoutListener implementation.
     @Override
     public void onGlobalLayout() {
-        if (!mAnchorView.isShown()) dismiss();
+        if (!mView.isShown()) notifyRectHidden();
     }
 
     // ViewTreeObserver.OnPreDrawListener implementation.
     @Override
     public boolean onPreDraw() {
-        if (!mAnchorView.isShown()) dismiss();
+        if (!mView.isShown()) {
+            notifyRectHidden();
+        } else {
+            refreshRectBounds();
+        }
+
         return true;
     }
 
@@ -101,42 +92,46 @@ public class ViewAnchoredTextBubble extends TextBubble
 
     @Override
     public void onViewDetachedFromWindow(View v) {
-        dismiss();
+        notifyRectHidden();
     }
 
-    // PositionObserver.Listener implementation.
-    @Override
-    public void onPositionChanged(int positionX, int positionY) {
-        refreshAnchorBounds();
-    }
+    private void refreshRectBounds() {
+        int previousPositionX = mCachedWindowCoordinates[0];
+        int previousPositionY = mCachedWindowCoordinates[1];
+        mView.getLocationInWindow(mCachedWindowCoordinates);
 
-    private void refreshAnchorBounds() {
-        mAnchorView.getLocationInWindow(mCachedWindowCoordinates);
+        // Return if the window position is invalid.
         if (mCachedWindowCoordinates[0] < 0 || mCachedWindowCoordinates[1] < 0) return;
 
-        mAnchorRect.left = mCachedWindowCoordinates[0];
-        mAnchorRect.top = mCachedWindowCoordinates[1];
-        mAnchorRect.right = mAnchorRect.left + mAnchorView.getWidth();
-        mAnchorRect.bottom = mAnchorRect.top + mAnchorView.getHeight();
+        // Return if the window coordinates haven't changed.
+        if (mCachedWindowCoordinates[0] == previousPositionX
+                && mCachedWindowCoordinates[1] == previousPositionY) {
+            return;
+        }
+
+        mRect.left = mCachedWindowCoordinates[0];
+        mRect.top = mCachedWindowCoordinates[1];
+        mRect.right = mRect.left + mView.getWidth();
+        mRect.bottom = mRect.top + mView.getHeight();
 
-        mAnchorRect.left += mInsetRect.left;
-        mAnchorRect.top += mInsetRect.top;
-        mAnchorRect.right -= mInsetRect.right;
-        mAnchorRect.bottom -= mInsetRect.bottom;
+        mRect.left += mInsetRect.left;
+        mRect.top += mInsetRect.top;
+        mRect.right -= mInsetRect.right;
+        mRect.bottom -= mInsetRect.bottom;
 
         // Account for the padding.
-        boolean isRtl = ApiCompatibilityUtils.isLayoutRtl(mAnchorView);
-        mAnchorRect.left += isRtl ? ApiCompatibilityUtils.getPaddingEnd(mAnchorView)
-                                  : ApiCompatibilityUtils.getPaddingStart(mAnchorView);
-        mAnchorRect.right -= isRtl ? ApiCompatibilityUtils.getPaddingStart(mAnchorView)
-                                   : ApiCompatibilityUtils.getPaddingEnd(mAnchorView);
-        mAnchorRect.top += mAnchorView.getPaddingTop();
-        mAnchorRect.bottom -= mAnchorView.getPaddingBottom();
+        boolean isRtl = ApiCompatibilityUtils.isLayoutRtl(mView);
+        mRect.left += isRtl ? ApiCompatibilityUtils.getPaddingEnd(mView)
+                            : ApiCompatibilityUtils.getPaddingStart(mView);
+        mRect.right -= isRtl ? ApiCompatibilityUtils.getPaddingStart(mView)
+                             : ApiCompatibilityUtils.getPaddingEnd(mView);
+        mRect.top += mView.getPaddingTop();
+        mRect.bottom -= mView.getPaddingBottom();
 
         // Make sure we still have a valid Rect after applying the inset.
-        mAnchorRect.right = Math.max(mAnchorRect.left, mAnchorRect.right);
-        mAnchorRect.bottom = Math.max(mAnchorRect.top, mAnchorRect.bottom);
+        mRect.right = Math.max(mRect.left, mRect.right);
+        mRect.bottom = Math.max(mRect.top, mRect.bottom);
 
-        setAnchorRect(mAnchorRect);
+        notifyRectChanged();
     }
-}
+}
\ No newline at end of file

chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetContentController.java

@@ -50,11 +50,12 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
 import org.chromium.chrome.browser.util.MathUtils;
 import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.chrome.browser.widget.ViewHighlighter;
+import org.chromium.chrome.browser.widget.ViewRectProvider;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetContent;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.StateChangeReason;
 import org.chromium.chrome.browser.widget.bottomsheet.base.BottomNavigationView;
 import org.chromium.chrome.browser.widget.bottomsheet.base.BottomNavigationView.OnNavigationItemSelectedListener;
-import org.chromium.chrome.browser.widget.textbubble.ViewAnchoredTextBubble;
+import org.chromium.chrome.browser.widget.textbubble.TextBubble;
 import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.ui.UiUtils;
 
@@ -801,8 +802,9 @@ public class BottomSheetContentController
             throw new RuntimeException("Attempting to show invalid content in bottom sheet.");
         }
 
-        final ViewAnchoredTextBubble helpBubble =
-                new ViewAnchoredTextBubble(getContext(), mBottomSheet, stringId, stringId);
+        ViewRectProvider rectProvider = new ViewRectProvider(mBottomSheet);
+        final TextBubble helpBubble =
+                new TextBubble(getContext(), mBottomSheet, stringId, stringId, rectProvider);
         helpBubble.setDismissOnTouchInteraction(true);
 
         mBottomSheet.addObserver(new EmptyBottomSheetObserver() {
@@ -829,7 +831,7 @@ public class BottomSheetContentController
                 if (state != BottomSheet.SHEET_STATE_HALF || mHelpBubbleShown) return;
                 int inset = getContext().getResources().getDimensionPixelSize(
                         R.dimen.bottom_sheet_help_bubble_inset);
-                helpBubble.setInsetPx(0, inset, 0, inset);
+                rectProvider.setInsetPx(0, inset, 0, inset);
                 helpBubble.show();
                 mHelpBubbleShown = true;
             }

chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/ChromeHomeIphBubbleController.java

@@ -24,9 +24,9 @@ import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.toolbar.BottomToolbarPhone;
 import org.chromium.chrome.browser.widget.ViewHighlighter;
+import org.chromium.chrome.browser.widget.ViewRectProvider;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.StateChangeReason;
 import org.chromium.chrome.browser.widget.textbubble.TextBubble;
-import org.chromium.chrome.browser.widget.textbubble.ViewAnchoredTextBubble;
 import org.chromium.components.feature_engagement.EventConstants;
 import org.chromium.components.feature_engagement.FeatureConstants;
 import org.chromium.components.feature_engagement.Tracker;
@@ -218,16 +218,16 @@ public class ChromeHomeIphBubbleController {
         };
 
         if (showAtTopOfScreen) {
-            mHelpBubble =
-                    new TextBubble(mContext, topAnchorView, stringId, accessibilityStringId, false);
-            mHelpBubble.setAnchorRect(getTopAnchorRect(topAnchorView));
+            mHelpBubble = new TextBubble(mContext, topAnchorView, stringId, accessibilityStringId,
+                    false, getTopAnchorRect(topAnchorView));
             topAnchorView.addOnLayoutChangeListener(topAnchorLayoutChangeListener);
         } else {
-            mHelpBubble = new ViewAnchoredTextBubble(
-                    mContext, anchorView, stringId, accessibilityStringId);
+            ViewRectProvider rectProvider = new ViewRectProvider(anchorView);
             int inset = mContext.getResources().getDimensionPixelSize(
                     R.dimen.bottom_sheet_help_bubble_inset);
-            ((ViewAnchoredTextBubble) mHelpBubble).setInsetPx(0, inset, 0, inset);
+            rectProvider.setInsetPx(0, inset, 0, inset);
+            mHelpBubble = new TextBubble(
+                    mContext, anchorView, stringId, accessibilityStringId, rectProvider);
         }
 
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.CHROME_HOME_PERSISTENT_IPH)) {

chrome/android/java_sources.gni

@@ -1333,6 +1333,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java",
   "java/src/org/chromium/chrome/browser/widget/AlertDialogEditText.java",
   "java/src/org/chromium/chrome/browser/widget/AlwaysDismissedDialog.java",
+  "java/src/org/chromium/chrome/browser/widget/AnchoredPopupWindow.java",
   "java/src/org/chromium/chrome/browser/widget/BoundedLinearLayout.java",
   "java/src/org/chromium/chrome/browser/widget/ClipDrawableProgressBar.java",
   "java/src/org/chromium/chrome/browser/widget/CompatibilityTextInputLayout.java",
@@ -1360,6 +1361,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/PulseInterpolator.java",
   "java/src/org/chromium/chrome/browser/widget/RadioButtonLayout.java",
   "java/src/org/chromium/chrome/browser/widget/RadioButtonWithDescription.java",
+  "java/src/org/chromium/chrome/browser/widget/RectProvider.java",
   "java/src/org/chromium/chrome/browser/widget/RoundedIconGenerator.java",
   "java/src/org/chromium/chrome/browser/widget/ThumbnailDiskStorage.java",
   "java/src/org/chromium/chrome/browser/widget/ThumbnailGenerator.java",
@@ -1374,6 +1376,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/ToolbarProgressBarAnimatingView.java",
   "java/src/org/chromium/chrome/browser/widget/VerticallyFixedEditText.java",
   "java/src/org/chromium/chrome/browser/widget/ViewHighlighter.java",
+  "java/src/org/chromium/chrome/browser/widget/ViewRectProvider.java",
   "java/src/org/chromium/chrome/browser/widget/ViewResourceFrameLayout.java",
   "java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelAdapter.java",
   "java/src/org/chromium/chrome/browser/widget/accessibility/AccessibilityTabModelListItem.java",
@@ -1420,7 +1423,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/widget/selection/SelectableListToolbar.java",
   "java/src/org/chromium/chrome/browser/widget/textbubble/ArrowBubbleDrawable.java",
   "java/src/org/chromium/chrome/browser/widget/textbubble/TextBubble.java",
-  "java/src/org/chromium/chrome/browser/widget/textbubble/ViewAnchoredTextBubble.java",
 ]
 
 chrome_vr_java_sources = [