Revert 287732 "<webview>: Move autosize from content to chrome."

trunk/src/chrome/renderer/resources/extensions/web_view.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This module implements Webview (<webview>) as a custom element that wraps a
 // BrowserPlugin object element. The object element is hidden within
 // the shadow DOM of the Webview element.
 
 var DocumentNatives = requireNative('document_natives');
 var GuestViewInternal =
     require('binding').Binding.create('guestViewInternal').generate();
 var IdGenerator = requireNative('id_generator');
 // TODO(lazyboy): Rename this to WebViewInternal and call WebViewInternal
 // something else.
 var WebView = require('webViewInternal').WebView;
 var WebViewEvents = require('webViewEvents').WebViewEvents;
 
-var WEB_VIEW_ATTRIBUTE_AUTOSIZE = 'autosize';
 var WEB_VIEW_ATTRIBUTE_MAXHEIGHT = 'maxheight';
 var WEB_VIEW_ATTRIBUTE_MAXWIDTH = 'maxwidth';
 var WEB_VIEW_ATTRIBUTE_MINHEIGHT = 'minheight';
 var WEB_VIEW_ATTRIBUTE_MINWIDTH = 'minwidth';
-var AUTO_SIZE_ATTRIBUTES = [
-  WEB_VIEW_ATTRIBUTE_AUTOSIZE,
-  WEB_VIEW_ATTRIBUTE_MAXHEIGHT,
-  WEB_VIEW_ATTRIBUTE_MAXWIDTH,
-  WEB_VIEW_ATTRIBUTE_MINHEIGHT,
-  WEB_VIEW_ATTRIBUTE_MINWIDTH
-];
-
 var WEB_VIEW_ATTRIBUTE_PARTITION = 'partition';
 
 var PLUGIN_METHOD_ATTACH = '-internal-attach';
 
 var ERROR_MSG_ALREADY_NAVIGATED =
     'The object has already navigated, so its partition cannot be changed.';
 var ERROR_MSG_INVALID_PARTITION_ATTRIBUTE = 'Invalid partition attribute.';
 
 /** @type {Array.<string>} */
 var WEB_VIEW_ATTRIBUTES = [
     'allowtransparency',
+    'autosize',
+    WEB_VIEW_ATTRIBUTE_MINHEIGHT,
+    WEB_VIEW_ATTRIBUTE_MINWIDTH,
+    WEB_VIEW_ATTRIBUTE_MAXHEIGHT,
+    WEB_VIEW_ATTRIBUTE_MAXWIDTH
 ];
 
 /** @class representing state of storage partition. */
 function Partition() {
   this.validPartitionId = true;
   this.persistStorage = false;
   this.storagePartitionId = '';
 };
 
 Partition.prototype.toAttribute = function() {
@@ skipping 260 matching lines @@
 /**
  * @private
  */
 WebViewInternal.prototype.insertCSS = function(var_args) {
   this.validateExecuteCodeCall();
   var args = $Array.concat([this.instanceId, this.src],
                            $Array.slice(arguments));
   $Function.apply(WebView.insertCSS, null, args);
 };
 
-WebViewInternal.prototype.setupAutoSizeProperties = function() {
-  var self = this;
-  $Array.forEach(AUTO_SIZE_ATTRIBUTES, function(attributeName) {
-    this[attributeName] = this.webviewNode.getAttribute(attributeName);
-    Object.defineProperty(this.webviewNode, attributeName, {
-      get: function() {
-        return self[attributeName];
-      },
-      set: function(value) {
-        self.webviewNode.setAttribute(attributeName, value);
-      },
-      enumerable: true
-    });
-  }, this);
-};
-
 /**
  * @private
  */
 WebViewInternal.prototype.setupWebviewNodeProperties = function() {
   var ERROR_MSG_CONTENTWINDOW_NOT_AVAILABLE = '<webview>: ' +
     'contentWindow is not available at this time. It will become available ' +
         'when the page has finished loading.';
 
-  this.setupAutoSizeProperties();
   var self = this;
   var browserPluginNode = this.browserPluginNode;
   // Expose getters and setters for the attributes.
   $Array.forEach(WEB_VIEW_ATTRIBUTES, function(attributeName) {
     Object.defineProperty(this.webviewNode, attributeName, {
       get: function() {
         if (browserPluginNode.hasOwnProperty(attributeName)) {
           return browserPluginNode[attributeName];
         } else {
           return browserPluginNode.getAttribute(attributeName);
@@ skipping 103 matching lines @@
 /**
  * @private
  */
 WebViewInternal.prototype.handleWebviewAttributeMutation =
       function(name, oldValue, newValue) {
   // This observer monitors mutations to attributes of the <webview> and
   // updates the BrowserPlugin properties accordingly. In turn, updating
   // a BrowserPlugin property will update the corresponding BrowserPlugin
   // attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
   // details.
-  if (AUTO_SIZE_ATTRIBUTES.indexOf(name) > -1) {
-    this[name] = newValue;
-    if (!this.instanceId) {
-      return;
-    }
-    // Convert autosize attribute to boolean.
-    var autosize = this.webviewNode.hasAttribute(WEB_VIEW_ATTRIBUTE_AUTOSIZE);
-    GuestViewInternal.setAutoSize(this.instanceId, {
-      'enableAutoSize': autosize,
-      'min': {
-        'width': parseInt(this.minwidth || 0),
-        'height': parseInt(this.minheight || 0)
-      },
-      'max': {
-        'width': parseInt(this.maxwidth || 0),
-        'height': parseInt(this.maxheight || 0)
-      }
-    });
-    return;
-  } else if (name == 'name') {
+  if (name == 'name') {
     // We treat null attribute (attribute removed) and the empty string as
     // one case.
     oldValue = oldValue || '';
     newValue = newValue || '';
 
     if (oldValue === newValue) {
       return;
     }
     this.name = newValue;
     if (!this.instanceId) {
@@ skipping 84 matching lines @@
     if (newValue != this.webviewNode.getAttribute(name)) {
       this.webviewNode.setAttribute(name, newValue);
     }
   } else {
     // If an attribute is removed from the BrowserPlugin, then remove it
     // from the <webview> as well.
     this.webviewNode.removeAttribute(name);
   }
 };
 
-WebViewInternal.prototype.onSizeChanged = function(webViewEvent) {
-  var newWidth = webViewEvent.newWidth;
-  var newHeight = webViewEvent.newHeight;
-
+WebViewInternal.prototype.onSizeChanged = function(newWidth, newHeight) {
   var node = this.webviewNode;
 
   var width = node.offsetWidth;
   var height = node.offsetHeight;
 
   // Check the current bounds to make sure we do not resize <webview>
   // outside of current constraints.
   var maxWidth;
   if (node.hasAttribute(WEB_VIEW_ATTRIBUTE_MAXWIDTH) &&
       node[WEB_VIEW_ATTRIBUTE_MAXWIDTH]) {
@@ skipping 24 matching lines @@
   if (node.hasAttribute(WEB_VIEW_ATTRIBUTE_MINHEIGHT) &&
       node[WEB_VIEW_ATTRIBUTE_MINHEIGHT]) {
     minHeight = node[WEB_VIEW_ATTRIBUTE_MINHEIGHT];
   } else {
     minHeight = height;
   }
   if (minHeight > maxHeight) {
     minHeight = maxHeight;
   }
 
-  if (!this.webviewNode.hasAttribute(WEB_VIEW_ATTRIBUTE_AUTOSIZE) ||
-      (newWidth >= minWidth &&
-       newWidth <= maxWidth &&
-       newHeight >= minHeight &&
-       newHeight <= maxHeight)) {
+  if (newWidth >= minWidth &&
+      newWidth <= maxWidth &&
+      newHeight >= minHeight &&
+      newHeight <= maxHeight) {
     node.style.width = newWidth + 'px';
     node.style.height = newHeight + 'px';
-    // Only fire the DOM event if the size of the <webview> has actually
-    // changed.
-    this.dispatchEvent(webViewEvent);
   }
 };
 
 // Returns true if Browser Plugin bindings is available.
 // Bindings are unavailable if <object> is not in the render tree.
 WebViewInternal.prototype.hasBindings = function() {
   return 'function' == typeof this.browserPluginNode[PLUGIN_METHOD_ATTACH];
 };
 
 WebViewInternal.prototype.hasNavigated = function() {
@@ skipping 166 matching lines @@
 
 WebViewInternal.prototype.getZoom = function(callback) {
   if (!this.instanceId) {
     return;
   }
   WebView.getZoom(this.instanceId, callback);
 };
 
 WebViewInternal.prototype.buildAttachParams = function(isNewWindow) {
   var params = {
-    'autosize': this.webviewNode.hasAttribute(WEB_VIEW_ATTRIBUTE_AUTOSIZE),
+    'api': 'webview',
     'instanceId': this.viewInstanceId,
-    'maxheight': parseInt(this.maxheight || 0),
-    'maxwidth': parseInt(this.maxwidth || 0),
-    'minheight': parseInt(this.minheight || 0),
-    'minwidth': parseInt(this.minwidth || 0),
     'name': this.name,
     // We don't need to navigate new window from here.
     'src': isNewWindow ? undefined : this.src,
     // If we have a partition from the opener, that will also be already
     // set via this.onAttach().
     'storagePartitionId': this.partition.toAttribute(),
     'userAgentOverride': this.userAgentOverride
   };
   return params;
 };
@@ skipping 169 matching lines @@
 };
 
 /**
  * Implemented when the experimental API is available.
  * @private
  */
 WebViewInternal.prototype.setupExperimentalContextMenus = function() {};
 
 exports.WebView = WebView;
 exports.WebViewInternal = WebViewInternal;