Commit fed10644 authored by Butkovits Atila's avatar Butkovits Atila
Browse files

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

Backed out changeset 64abec51f1cb (bug 1710533) for causing failures at test_panel.xhtml. CLOSED TREE
parent b770282e

view/nsView.cpp

+0 −3
Original line number Diff line number Diff line
@@ -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();

widget/nsBaseWidget.h

+1 −1
Original line number Diff line number Diff line
@@ -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 =

widget/nsIWidget.h

+0 −8
Original line number Diff line number Diff line
@@ -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.