[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 509 matching lines @@
         if (typeof this._minimumSize !== "undefined")
             return this._minimumSize;
         if (typeof this._cachedMinimumSize === "undefined")
             this._cachedMinimumSize = this.calculateMinimumSize();
         return this._cachedMinimumSize;
     },
 
     /**
      * @param {number} width
      * @param {number} height
+     * @param {number=} preferredWidth
+     * @param {number=} preferredHeight
      */
-    setMinimumSize: function(width, height)
+    setMinimumSize: function(width, height, preferredWidth, preferredHeight)
     {
-        this._minimumSize = new Size(width, height);
+        this._minimumSize = new Size(width, height, preferredWidth, preferredHeight);
         this.invalidateMinimumSize();
     },
 
     /**
      * @return {boolean}
      */
     _hasNonZeroMinimumSize: function()
     {
         var size = this.minimumSize();
-        return size.width || size.height;
+        return !!(size.width || size.height || size.preferredWidth || size.preferredHeight);
     },
 
     invalidateMinimumSize: function()
     {
         var cached = this._cachedMinimumSize;
         delete this._cachedMinimumSize;
         var actual = this.minimumSize();
         if (!actual.isEqual(cached) && this._parentView)
             this._parentView.invalidateMinimumSize();
         else
@@ skipping 49 matching lines @@
     WebInspector.View.call(this);
     this.element.classList.add("vbox");
 };
 
 WebInspector.VBox.prototype = {
     /**
      * @return {!Size}
      */
     calculateMinimumSize: function()
     {
-        var width = 0;
-        var height = 0;
+        var size = new Size(0, 0);
 
         /**
          * @this {!WebInspector.View}
          * @suppressReceiverCheck
          */
         function updateForChild()
         {
-            var size = this.minimumSize();
-            width = Math.max(width, size.width);
-            height += size.height;
+            var childSize = this.minimumSize();
+            size = size.widthToMax(childSize);
+            size = size.addHeight(childSize);
         }
 
         this._callOnVisibleChildren(updateForChild);
-        return new Size(width, height);
+        return size;
     },
 
     __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}
      */
     calculateMinimumSize: function()
     {
-        var width = 0;
-        var height = 0;
+        var size = new Size(0, 0);
 
         /**
          * @this {!WebInspector.View}
          * @suppressReceiverCheck
          */
         function updateForChild()
         {
-            var size = this.minimumSize();
-            width += size.width;
-            height = Math.max(height, size.height);
+            var childSize = this.minimumSize();
+            size = size.addWidth(childSize);
+            size = size.heightToMax(childSize);
         }
 
         this._callOnVisibleChildren(updateForChild);
-        return new Size(width, height);
+        return size;
     },
 
     __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);
 }