Revert 220402 "Improve <webview> autosize:"

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.
 
 // Shim that simulates a <webview> tag via Mutation Observers.
 //
 // The actual tag is implemented via the browser plugin. The internals of this
 // are hidden via Shadow DOM.
 
 'use strict';
 
 var DocumentNatives = requireNative('document_natives');
 var EventBindings = require('event_bindings');
 var MessagingNatives = requireNative('messaging_natives');
 var WebRequestEvent = require('webRequestInternal').WebRequestEvent;
 var WebRequestSchema =
     requireNative('schema_registry').GetSchema('webRequest');
 var WebView = require('binding').Binding.create('webview').generate();
 
 // This secret enables hiding <webview> private members from the outside scope.
 // Outside of this file, |secret| is inaccessible. The only way to access the
 // <webview> element's internal members is via the |secret|. Since it's only
 // accessible by code here (and in web_view_experimental), only <webview>'s
 // API can access it and not external developers.
 var secret = {};
 
-var WEB_VIEW_ATTRIBUTE_MAXHEIGHT = 'maxheight';
-var WEB_VIEW_ATTRIBUTE_MAXWIDTH = 'maxwidth';
-var WEB_VIEW_ATTRIBUTE_MINHEIGHT = 'minheight';
-var WEB_VIEW_ATTRIBUTE_MINWIDTH = 'minwidth';
-
 /** @type {Array.<string>} */
-var WEB_VIEW_ATTRIBUTES = [
-    'name',
-    'partition',
-    'autosize',
-    WEB_VIEW_ATTRIBUTE_MINHEIGHT,
-    WEB_VIEW_ATTRIBUTE_MINWIDTH,
-    WEB_VIEW_ATTRIBUTE_MAXHEIGHT,
-    WEB_VIEW_ATTRIBUTE_MAXWIDTH
-];
+var WEB_VIEW_ATTRIBUTES = ['name', 'partition', 'autosize', 'minheight',
+    'minwidth', 'maxheight', 'maxwidth'];
 
 var webViewInstanceIdCounter = 0;
 
 var CreateEvent = function(name) {
   var eventOpts = {supportsListeners: true, supportsFilters: true};
   return new EventBindings.Event(name, undefined, eventOpts);
 };
 
 var WEB_VIEW_EVENTS = {
   'close': {
@@ skipping 62 matching lines @@
       'url',
       'userGesture'
     ]
   },
   'responsive': {
     evt: CreateEvent('webview.onResponsive'),
     fields: ['processId']
   },
   'sizechanged': {
     evt: CreateEvent('webview.onSizeChanged'),
-    customHandler: function(webViewInternal, event, webViewEvent) {
-      webViewInternal.handleSizeChangedEvent_(event, webViewEvent);
-    },
     fields: ['oldHeight', 'oldWidth', 'newHeight', 'newWidth']
   },
   'unresponsive': {
     evt: CreateEvent('webview.onUnresponsive'),
     fields: ['processId']
   }
 };
 
 // Implemented when the experimental API is available.
 WebViewInternal.maybeRegisterExperimentalAPIs = function(proto) {}
@@ skipping 342 matching lines @@
  * @private
  */
 WebViewInternal.prototype.getEvents_ = function() {
   var experimentalEvents = this.maybeGetExperimentalEvents_();
   for (var eventName in experimentalEvents) {
     WEB_VIEW_EVENTS[eventName] = experimentalEvents[eventName];
   }
   return WEB_VIEW_EVENTS;
 };
 
-WebViewInternal.prototype.handleSizeChangedEvent_ =
-    function(event, webViewEvent) {
-  var node = this.webviewNode_;
-
-  // Check the current bounds to make sure we do not resize <webview>
-  // outside of current constraints.
-  var minWidth = 0;
-  if (node.hasAttribute(WEB_VIEW_ATTRIBUTE_MINWIDTH) &&
-      node[WEB_VIEW_ATTRIBUTE_MINWIDTH]) {
-    minWidth = node[WEB_VIEW_ATTRIBUTE_MINWIDTH];
-  }
-  var maxWidth;
-  if (node.hasAttribute(WEB_VIEW_ATTRIBUTE_MAXWIDTH) &&
-      node[WEB_VIEW_ATTRIBUTE_MAXWIDTH]) {
-    maxWidth = node[WEB_VIEW_ATTRIBUTE_MAXWIDTH];
-  } else {
-    maxWidth = node.offsetWidth;
-  }
-  if (minWidth > maxWidth) {
-    minWidth = maxWidth;
-  }
-
-  var minHeight = 0;
-  if (node.hasAttribute(WEB_VIEW_ATTRIBUTE_MINHEIGHT) &&
-      node[WEB_VIEW_ATTRIBUTE_MINHEIGHT]) {
-    minHeight = node[WEB_VIEW_ATTRIBUTE_MINHEIGHT];
-  }
-  var maxHeight;
-  if (node.hasAttribute(WEB_VIEW_ATTRIBUTE_MAXHEIGHT) &&
-      node[WEB_VIEW_ATTRIBUTE_MAXHEIGHT]) {
-    maxHeight = node[WEB_VIEW_ATTRIBUTE_MAXHEIGHT];
-  } else {
-    maxHeight = node.offsetHeight;
-  }
-  if (minHeight > maxHeight) {
-    minHeight = maxHeight;
-  }
-
-  if (webViewEvent.newWidth >= minWidth &&
-      webViewEvent.newWidth <= maxWidth &&
-      webViewEvent.newHeight >= minHeight &&
-      webViewEvent.newHeight <= maxHeight) {
-    node.style.width = webViewEvent.newWidth + 'px';
-    node.style.height = webViewEvent.newHeight + 'px';
-  }
-  node.dispatchEvent(webViewEvent);
-};
-
 /**
  * @private
  */
 WebViewInternal.prototype.setupWebviewNodeEvents_ = function() {
   var self = this;
   this.viewInstanceId_ = ++webViewInstanceIdCounter;
   var onInstanceIdAllocated = function(e) {
     var detail = e.detail ? JSON.parse(e.detail) : {};
     self.instanceId_ = detail.windowId;
     var params = {
@@ skipping 373 matching lines @@
 
 /**
  * Implemented when the experimental API is available.
  * @private
  */
 WebViewInternal.prototype.maybeAttachWebRequestEventToWebview_ = function() {};
 
 exports.WebView = WebView;
 exports.WebViewInternal = WebViewInternal;
 exports.CreateEvent = CreateEvent;