Bug 1933094 - Remove nsView::GetFloating and associated code. r=jwatt

The only place it matters is GetDisplayRootFor and we check for popups
explicitly there.

Differential Revision: https://phabricator.services.mozilla.com/D230058

Author: emilio

layout/xul/nsMenuPopupFrame.cpp

@@ -149,12 +149,7 @@ void nsMenuPopupFrame::Init(nsIContent* aContent, nsContainerFrame* aParent,
 
   CreatePopupView();
 
-  // XXX Hack. The popup's view should float above all other views,
-  // so we use the nsView::SetFloating() to tell the view manager
-  // about that constraint.
   nsView* ourView = GetView();
-  nsViewManager* viewManager = ourView->GetViewManager();
-  viewManager->SetViewFloating(ourView, true);
 
   const auto& el = PopupElement();
   mPopupType = PopupType::Panel;

view/nsView.cpp

@@ -419,13 +419,6 @@ void nsView::SetVisibility(ViewVisibility aVisibility) {
   NotifyEffectiveVisibilityChanged(IsEffectivelyVisible());
 }
 
-void nsView::SetFloating(bool aFloatingView) {
-  if (aFloatingView)
-    mVFlags |= NS_VIEW_FLAG_FLOATING;
-  else
-    mVFlags &= ~NS_VIEW_FLAG_FLOATING;
-}
-
 void nsView::InvalidateHierarchy() {
   if (mViewManager->GetRootView() == this) mViewManager->InvalidateHierarchy();
 

view/nsView.h

@@ -100,11 +100,6 @@ enum class WindowType : uint8_t;
 //        the layer's parent.
 enum class ViewVisibility : uint8_t { Hide = 0, Show = 1 };
 
-// Public view flags
-
-// Indicates that the view is a floating view.
-#define NS_VIEW_FLAG_FLOATING 0x0008
-
 //----------------------------------------------------------------------
 
 /**
@@ -225,16 +220,6 @@ class nsView final : public nsIWidgetListener {
    */
   ViewVisibility GetVisibility() const { return mVis; }
 
-  /**
-   * Get whether the view "floats" above all other views,
-   * which tells the compositor not to consider higher views in
-   * the view hierarchy that would geometrically intersect with
-   * this view. This is a hack, but it fixes some problems with
-   * views that need to be drawn in front of all other views.
-   * @result true if the view floats, false otherwise.
-   */
-  bool GetFloating() const { return (mVFlags & NS_VIEW_FLAG_FLOATING) != 0; }
-
   /**
    * Called to query the parent of the view.
    * @result view's parent
@@ -400,8 +385,7 @@ class nsView final : public nsIWidgetListener {
 
   nsRegion& GetDirtyRegion() {
     if (!mDirtyRegion) {
-      NS_ASSERTION(!mParent || GetFloating(),
-                   "Only display roots should have dirty regions");
+      NS_ASSERTION(!mParent, "Only display roots should have dirty regions");
       mDirtyRegion = mozilla::MakeUnique<nsRegion>();
     }
     return *mDirtyRegion;
@@ -472,16 +456,6 @@ class nsView final : public nsIWidgetListener {
    */
   void SetVisibility(ViewVisibility visibility);
 
-  /**
-   * Set/Get whether the view "floats" above all other views,
-   * which tells the compositor not to consider higher views in
-   * the view hierarchy that would geometrically intersect with
-   * this view. This is a hack, but it fixes some problems with
-   * views that need to be drawn in front of all other views.
-   * @result true if the view floats, false otherwise.
-   */
-  void SetFloating(bool aFloatingView);
-
   // Helper function to get mouse grabbing off this view (by moving it to the
   // parent, if we can)
   void DropMouseGrabbing();

view/nsViewManager.cpp

@@ -214,20 +214,13 @@ nsView* nsViewManager::GetDisplayRootFor(nsView* aView) {
   nsView* displayRoot = aView;
   for (;;) {
     nsView* displayParent = displayRoot->GetParent();
-    if (!displayParent) return displayRoot;
-
-    if (displayRoot->GetFloating() && !displayParent->GetFloating())
+    if (!displayParent) {
       return displayRoot;
+    }
 
-    // If we have a combobox dropdown popup within a panel popup, both the view
-    // for the dropdown popup and its parent will be floating, so we need to
-    // distinguish this situation. We do this by looking for a widget. Any view
-    // with a widget is a display root.
+    // Any view with a widget is a display root.
     nsIWidget* widget = displayRoot->GetWidget();
     if (widget && widget->GetWindowType() == widget::WindowType::Popup) {
-      NS_ASSERTION(displayRoot->GetFloating() && displayParent->GetFloating(),
-                   "this should only happen with floating views that have "
-                   "floating parents");
       return displayRoot;
     }
 
@@ -755,10 +748,6 @@ void nsViewManager::InsertChild(nsView* aParent, nsView* aChild,
         ReparentWidgets(aChild, aParent);
       }
     }
-
-    // if the parent view is marked as "floating", make the newly added view
-    // float as well.
-    if (aParent->GetFloating()) aChild->SetFloating(true);
   }
 }
 
@@ -795,12 +784,6 @@ void nsViewManager::ResizeView(nsView* aView, const nsRect& aRect) {
   // because layout will change it back again if necessary.
 }
 
-void nsViewManager::SetViewFloating(nsView* aView, bool aFloating) {
-  NS_ASSERTION(aView, "no view");
-
-  aView->SetFloating(aFloating);
-}
-
 void nsViewManager::SetViewVisibility(nsView* aView, ViewVisibility aVisible) {
   NS_ASSERTION(aView->GetViewManager() == this, "wrong view manager");
 

view/nsViewManager.h

@@ -196,15 +196,6 @@ class nsViewManager final {
    */
   void SetViewVisibility(nsView* aView, ViewVisibility aVisible);
 
-  /**
-   * Set whether the view "floats" above all other views,
-   * which tells the compositor not to consider higher views in
-   * the view hierarchy that would geometrically intersect with
-   * this view. This is a hack, but it fixes some problems with
-   * views that need to be drawn in front of all other views.
-   */
-  void SetViewFloating(nsView* aView, bool aFloatingView);
-
   /**
    * Set the presshell associated with this manager
    * @param aPresShell - new presshell