[DevTools] Add preferred size to WebInspector.View.

Source/devtools/front_end/View.js

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2011 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 263 matching lines @@
                 WebInspector.View._originalInsertBefore.call(parentElement, this.element, insertBefore);
             else
                 WebInspector.View._originalAppendChild.call(parentElement, this.element);
         }
 
         if (this._parentIsShowing()) {
             this._processWasShown();
             this._cacheSize();
         }
 
-        if (this._parentView && this._hasNonZeroMinimumSize())
-            this._parentView.invalidateMinimumSize();
+        if (this._parentView && this._hasNonZeroConstraints())
+            this._parentView.invalidateConstraints();
     },
 
     /**
      * @param {boolean=} overrideHideOnDetach
      */
     detach: function(overrideHideOnDetach)
     {
         var parentElement = this.element.parentElement;
         if (!parentElement)
             return;
 
         if (this._parentIsShowing()) {
             this._processDiscardCachedSize();
             this._processWillHide();
         }
 
         if (this._hideOnDetach && !overrideHideOnDetach) {
             this.element.classList.remove("visible");
             this._visible = false;
             if (this._parentIsShowing())
                 this._processWasHidden();
-            if (this._parentView && this._hasNonZeroMinimumSize())
-                this._parentView.invalidateMinimumSize();
+            if (this._parentView && this._hasNonZeroConstraints())
+                this._parentView.invalidateConstraints();
             return;
         }
 
         // Force legal removal
         WebInspector.View._decrementViewCounter(parentElement, this.element);
         WebInspector.View._originalRemoveChild.call(parentElement, this.element);
 
         this._visible = false;
         if (this._parentIsShowing())
             this._processWasHidden();
 
         // Update view hierarchy
         if (this._parentView) {
             var childIndex = this._parentView._children.indexOf(this);
             WebInspector.View._assert(childIndex >= 0, "Attempt to remove non-child view");
             this._parentView._children.splice(childIndex, 1);
             var parent = this._parentView;
             this._parentView = null;
-            if (this._hasNonZeroMinimumSize())
-                parent.invalidateMinimumSize();
+            if (this._hasNonZeroConstraints())
+                parent.invalidateConstraints();
         } else
             WebInspector.View._assert(this._isRoot, "Removing non-root view from DOM");
     },
 
     detachChildViews: function()
     {
         var children = this._children.slice();
         for (var i = 0; i < children.length; ++i)
             children[i].detach();
     },
@@ skipping 159 matching lines @@
         WebInspector.View._originalAppendChild.call(document.body, this.element);
         this.element.positionAt(0, 0);
         var result = new Size(this.element.offsetWidth, this.element.offsetHeight);
         this.element.positionAt(undefined, undefined);
         WebInspector.View._originalRemoveChild.call(document.body, this.element);
         this._disableCSSIfNeeded();
         return result;
     },
 
     /**
-     * @return {!Size}
+     * @return {!Constraints}
      */
-    calculateMinimumSize: function()
+    calculateConstraints: function()
     {
-        return new Size(0, 0);
+        return new Constraints(new Size(0, 0));
     },
 
     /**
-     * @return {!Size}
+     * @return {!Constraints}
      */
-    minimumSize: function()
+    constraints: function()
     {
-        if (typeof this._minimumSize !== "undefined")
-            return this._minimumSize;
-        if (typeof this._cachedMinimumSize === "undefined")
-            this._cachedMinimumSize = this.calculateMinimumSize();
-        return this._cachedMinimumSize;
+        if (typeof this._constraints !== "undefined")
+            return this._constraints;
+        if (typeof this._cachedConstraints === "undefined")
+            this._cachedConstraints = this.calculateConstraints();
+        return this._cachedConstraints;
     },
 
     /**
      * @param {number} width
      * @param {number} height
+     * @param {number=} preferredWidth
+     * @param {number=} preferredHeight
      */
-    setMinimumSize: function(width, height)
+    setConstraints: function(width, height, preferredWidth, preferredHeight)

[pfeldman, 2014/03/31 12:10:39]

Why not setMinimumSize and setPreferredSize? You would only have 2 usages of the
latter.

[dgozman, 2014/03/31 13:23:57]

There will be more preferred sizes in follow-up patches.
Also, setting preferred size without minimum size does not make a sense.

     {
-        this._minimumSize = new Size(width, height);
-        this.invalidateMinimumSize();
+        if (typeof preferredWidth === "undefined")
+            preferredWidth = width;
+        if (typeof preferredHeight === "undefined")
+            preferredHeight = height;
+        this._constraints = new Constraints(new Size(width, height), new Size(preferredWidth, preferredHeight));
+        this.invalidateConstraints();
     },
 
     /**
      * @return {boolean}
      */
-    _hasNonZeroMinimumSize: function()
+    _hasNonZeroConstraints: function()
     {
-        var size = this.minimumSize();
-        return size.width || size.height;
+        var constraints = this.constraints();
+        return !!(constraints.minimum.width || constraints.minimum.height || constraints.preferred.width || constraints.preferred.height);
     },
 
-    invalidateMinimumSize: function()
+    invalidateConstraints: function()
     {
-        var cached = this._cachedMinimumSize;
-        delete this._cachedMinimumSize;
-        var actual = this.minimumSize();
+        var cached = this._cachedConstraints;
+        delete this._cachedConstraints;
+        var actual = this.constraints();
         if (!actual.isEqual(cached) && this._parentView)
-            this._parentView.invalidateMinimumSize();
+            this._parentView.invalidateConstraints();
         else
             this.doLayout();
     },
 
     __proto__: WebInspector.Object.prototype
 }
 
 WebInspector.View._originalAppendChild = Element.prototype.appendChild;
 WebInspector.View._originalInsertBefore = Element.prototype.insertBefore;
 WebInspector.View._originalRemoveChild = Element.prototype.removeChild;
@@ skipping 36 matching lines @@
  * @extends {WebInspector.View}
  */
 WebInspector.VBox = function()
 {
     WebInspector.View.call(this);
     this.element.classList.add("vbox");
 };
 
 WebInspector.VBox.prototype = {
     /**
-     * @return {!Size}
+     * @return {!Constraints}
      */
-    calculateMinimumSize: function()
+    calculateConstraints: function()
     {
-        var width = 0;
-        var height = 0;
+        var constraints = new Constraints(new Size(0, 0));
 
         /**
          * @this {!WebInspector.View}
          * @suppressReceiverCheck
          */
         function updateForChild()
         {
-            var size = this.minimumSize();
-            width = Math.max(width, size.width);
-            height += size.height;
+            var child = this.constraints();
+            constraints = constraints.widthToMax(child);
+            constraints = constraints.addHeight(child);
         }
 
         this._callOnVisibleChildren(updateForChild);
-        return new Size(width, height);
+        return constraints;
     },
 
     __proto__: WebInspector.View.prototype
 };
 
 /**
  * @constructor
  * @extends {WebInspector.View}
  */
 WebInspector.HBox = function()
 {
     WebInspector.View.call(this);
     this.element.classList.add("hbox");
 };
 
 WebInspector.HBox.prototype = {
     /**
-     * @return {!Size}
+     * @return {!Constraints}
      */
-    calculateMinimumSize: function()
+    calculateConstraints: function()
     {
-        var width = 0;
-        var height = 0;
+        var constraints = new Constraints(new Size(0, 0));
 
         /**
          * @this {!WebInspector.View}
          * @suppressReceiverCheck
          */
         function updateForChild()
         {
-            var size = this.minimumSize();
-            width += size.width;
-            height = Math.max(height, size.height);
+            var child = this.constraints();
+            constraints = constraints.addWidth(child);
+            constraints = constraints.heightToMax(child);
         }
 
         this._callOnVisibleChildren(updateForChild);
-        return new Size(width, height);
+        return constraints;
     },
 
     __proto__: WebInspector.View.prototype
 };
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  * @param {function()} resizeCallback
  */
@@ skipping 29 matching lines @@
 {
     WebInspector.View._assert(!child.__viewCounter && !child.__view, "Attempt to remove element containing view via regular DOM operation");
     return WebInspector.View._originalRemoveChild.call(this, child);
 }
 
 Element.prototype.removeChildren = function()
 {
     WebInspector.View._assert(!this.__viewCounter, "Attempt to remove element containing view via regular DOM operation");
     WebInspector.View._originalRemoveChildren.call(this);
 }