Backed out changeset 64abec51f1cb (bug 1710533) for causing failures …

…at test_panel.xhtml. CLOSED TREE
dothq · May 12, 2021 · fed1064 · fed1064
1 parent b770282
commit fed1064
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/view/nsView.cpp b/view/nsView.cpp
@@ -332,9 +332,6 @@ void nsView::DoResetWidgetBounds(bool aMoveOnly, bool aInvalidateChangedSize) {
     return;
   }
 
-  // Apply the widget size constraints to newBounds.
-  widget->ConstrainSize(&newBounds.width, &newBounds.height);
-
   bool changedPos = curBounds.TopLeft() != newBounds.TopLeft();
   bool changedSize = curBounds.Size() != newBounds.Size();
 

diff --git a/widget/nsBaseWidget.h b/widget/nsBaseWidget.h
@@ -578,7 +578,7 @@ class nsBaseWidget : public nsIWidget, public nsSupportsWeakReference {
    * @param aWidth width to constrain
    * @param aHeight height to constrain
    */
-  void ConstrainSize(int32_t* aWidth, int32_t* aHeight) override {
+  void ConstrainSize(int32_t* aWidth, int32_t* aHeight) {
     SizeConstraints c = GetSizeConstraints();
     *aWidth = std::max(c.mMinSize.width, std::min(c.mMaxSize.width, *aWidth));
     *aHeight =

diff --git a/widget/nsIWidget.h b/widget/nsIWidget.h
@@ -2079,14 +2079,6 @@ class nsIWidget : public nsISupports {
    */
   virtual const SizeConstraints GetSizeConstraints() = 0;
 
-  /**
-   * Apply the current size constraints to the given size.
-   *
-   * @param aWidth width to constrain
-   * @param aHeight height to constrain
-   */
-  virtual void ConstrainSize(int32_t* aWidth, int32_t* aHeight) = 0;
-
   /**
    * If this is owned by a BrowserChild, return that.  Otherwise return
    * null.