Various webview cleanup.

extensions/renderer/resources/guest_view/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 =
@@ skipping 32 matching lines @@
 }
 
 WebViewImpl.prototype.createBrowserPluginNode = function() {
   // We create BrowserPlugin as a custom element in order to observe changes
   // to attributes synchronously.
   var browserPluginNode = new WebViewImpl.BrowserPlugin();
   privates(browserPluginNode).internal = this;
   return browserPluginNode;
 };
 
-WebViewImpl.prototype.getGuestInstanceId = function() {
-  return this.guestInstanceId;
-};
-
 // Resets some state upon reattaching <webview> element to the DOM.
 WebViewImpl.prototype.reset = function() {
   // If guestInstanceId is defined then the <webview> has navigated and has
   // already picked up a partition ID. Thus, we need to reset the initialization
   // state. However, it may be the case that beforeFirstNavigation is false BUT
   // guestInstanceId has yet to be initialized. This means that we have not
   // heard back from createGuest yet. We will not reset the flag in this case so
   // that we don't end up allocating a second guest.
   if (this.guestInstanceId) {
     GuestViewInternal.destroyGuest(this.guestInstanceId);
@@ skipping 29 matching lines @@
   this.webviewNode.addEventListener('focus', function(e) {
     // Focus the BrowserPlugin when the <webview> takes focus.
     this.browserPluginNode.focus();
   }.bind(this));
   this.webviewNode.addEventListener('blur', function(e) {
     // Blur the BrowserPlugin when the <webview> loses focus.
     this.browserPluginNode.blur();
   }.bind(this));
 };
 
-// Validation helper function for executeScript() and insertCSS().
-WebViewImpl.prototype.validateExecuteCodeCall  = function() {
-  if (!this.guestInstanceId) {
-    throw new Error(WebViewConstants.ERROR_MSG_CANNOT_INJECT_SCRIPT);
-  }
-};
-
 WebViewImpl.prototype.setupWebviewNodeProperties = function() {
   // We cannot use {writable: true} property descriptor because we want a
   // dynamic getter value.
   Object.defineProperty(this.webviewNode, 'contentWindow', {
     get: function() {
       if (this.contentWindow) {
         return this.contentWindow;
       }
       window.console.error(
           WebViewConstants.ERROR_MSG_CONTENTWINDOW_NOT_AVAILABLE);
@@ skipping 45 matching lines @@
   var newWidth = webViewEvent.newWidth;
   var newHeight = webViewEvent.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(WebViewConstants.ATTRIBUTE_MAXWIDTH) &&
-      node[WebViewConstants.ATTRIBUTE_MAXWIDTH]) {
-    maxWidth = node[WebViewConstants.ATTRIBUTE_MAXWIDTH];
-  } else {
-    maxWidth = width;
-  }
+  var maxWidth = this.attributes[
+    WebViewConstants.ATTRIBUTE_MAXWIDTH].getValue() || width;
+  var minWidth = this.attributes[
+    WebViewConstants.ATTRIBUTE_MINWIDTH].getValue() || width;
+  var maxHeight = this.attributes[
+    WebViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() || height;
+  var minHeight = this.attributes[
+    WebViewConstants.ATTRIBUTE_MINHEIGHT].getValue() || height;
 
-  var minWidth;
-  if (node.hasAttribute(WebViewConstants.ATTRIBUTE_MINWIDTH) &&
-      node[WebViewConstants.ATTRIBUTE_MINWIDTH]) {
-    minWidth = node[WebViewConstants.ATTRIBUTE_MINWIDTH];
-  } else {
-    minWidth = width;
-  }
-  if (minWidth > maxWidth) {
-    minWidth = maxWidth;
-  }
-
-  var maxHeight;
-  if (node.hasAttribute(WebViewConstants.ATTRIBUTE_MAXHEIGHT) &&
-      node[WebViewConstants.ATTRIBUTE_MAXHEIGHT]) {
-    maxHeight = node[WebViewConstants.ATTRIBUTE_MAXHEIGHT];
-  } else {
-    maxHeight = height;
-  }
-
-  var minHeight;
-  if (node.hasAttribute(WebViewConstants.ATTRIBUTE_MINHEIGHT) &&
-      node[WebViewConstants.ATTRIBUTE_MINHEIGHT]) {
-    minHeight = node[WebViewConstants.ATTRIBUTE_MINHEIGHT];
-  } else {
-    minHeight = height;
-  }
-  if (minHeight > maxHeight) {
-    minHeight = maxHeight;
-  }
+  minWidth = Math.min(minWidth, maxWidth);
+  minHeight = Math.min(minHeight, maxHeight);
 
   if (!this.attributes[WebViewConstants.ATTRIBUTE_AUTOSIZE].getValue() ||
       (newWidth >= minWidth &&
-       newWidth <= maxWidth &&
-       newHeight >= minHeight &&
-       newHeight <= maxHeight)) {
+      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 if <object> is in the render tree.
-WebViewImpl.prototype.isPluginInRenderTree = function() {
-  return !!this.internalInstanceId && this.internalInstanceId != 0;
-};
-
-WebViewImpl.prototype.hasNavigated = function() {
-  return !this.beforeFirstNavigation;
-};
-
 WebViewImpl.prototype.parseSrcAttribute = function() {
   if (!this.attributes[WebViewConstants.ATTRIBUTE_PARTITION].validPartitionId ||
       !this.attributes[WebViewConstants.ATTRIBUTE_SRC].getValue()) {
     return;
   }
 
   if (this.guestInstanceId == undefined) {
     if (this.beforeFirstNavigation) {
       this.beforeFirstNavigation = false;
       this.createGuest();
     }
     return;
   }
 
   // Navigate to |this.src|.
   WebViewInternal.navigate(
       this.guestInstanceId,
       this.attributes[WebViewConstants.ATTRIBUTE_SRC].getValue());
 };
 
-WebViewImpl.prototype.parseAttributes = function() {
-  if (!this.elementAttached) {
-    return;
-  }
-  this.parseSrcAttribute();
-};
-
 WebViewImpl.prototype.createGuest = function() {
   if (this.pendingGuestCreation) {
     return;
   }
   var params = {
     'storagePartitionId': this.attributes[
         WebViewConstants.ATTRIBUTE_PARTITION].getValue()
   };
   GuestViewInternal.createGuest(
       'webview',
@@ skipping 74 matching lines @@
   for (var i in this.attributes) {
     params[i] = this.attributes[i].getValue();
   }
   return params;
 };
 
 WebViewImpl.prototype.attachWindow = function(guestInstanceId) {
   this.guestInstanceId = guestInstanceId;
   var params = this.buildAttachParams();
 
-  if (!this.isPluginInRenderTree()) {
+  if (!this.internalInstanceId) {
     return true;
   }
 
   return guestViewInternalNatives.AttachGuest(
       this.internalInstanceId,
       this.guestInstanceId,
       params, function(w) {
         this.contentWindow = w;
       }.bind(this)
   );
@@ skipping 21 matching lines @@
 
 // Clears browsing data for the WebView partition.
 WebViewImpl.prototype.clearData = function() {
   if (!this.guestInstanceId) {
     return;
   }
   var args = $Array.concat([this.guestInstanceId], $Array.slice(arguments));
   $Function.apply(WebViewInternal.clearData, null, args);
 };
 
-// Injects JavaScript code into the guest page.
-WebViewImpl.prototype.executeScript = function(var_args) {
-  this.validateExecuteCodeCall();
+// Shared implementation of executeScript() and insertCSS().
+WebViewImpl.prototype.executeCode = function(func, args) {
+  if (!this.guestInstanceId) {
+    window.console.error(WebViewConstants.ERROR_MSG_CANNOT_INJECT_SCRIPT);
+    return;
+  }
+
   var webviewSrc = this.attributes[WebViewConstants.ATTRIBUTE_SRC].getValue();
   if (this.baseUrlForDataUrl != '') {
     webviewSrc = this.baseUrlForDataUrl;
   }
-  var args = $Array.concat([this.guestInstanceId, webviewSrc],
-                           $Array.slice(arguments));
-  $Function.apply(WebViewInternal.executeScript, null, args);
+
+  args = $Array.concat([this.guestInstanceId, webviewSrc],
+                       $Array.slice(args));
+  $Function.apply(func, null, args);
+}
+
+// Injects JavaScript code into the guest page.
+WebViewImpl.prototype.executeScript = function(var_args) {
+  this.executeCode(WebViewInternal.executeScript, $Array.slice(arguments));
 };
 
 // Initiates a find-in-page request.
 WebViewImpl.prototype.find = function(search_text, options, callback) {
   if (!this.guestInstanceId) {
     return;
   }
   WebViewInternal.find(this.guestInstanceId, search_text, options, callback);
 };
 
@@ skipping 25 matching lines @@
 // navigation.
 WebViewImpl.prototype.go = function(relativeIndex, callback) {
   if (!this.guestInstanceId) {
     return;
   }
   WebViewInternal.go(this.guestInstanceId, relativeIndex, callback);
 };
 
 // Injects CSS into the guest page.
 WebViewImpl.prototype.insertCSS = function(var_args) {
-  this.validateExecuteCodeCall();
-  var webviewSrc = this.attributes[WebViewConstants.ATTRIBUTE_SRC].getValue();
-  if (this.baseUrlForDataUrl != '') {
-    webviewSrc = this.baseUrlForDataUrl;
-  }
-  var args = $Array.concat([this.guestInstanceId, webviewSrc],
-                           $Array.slice(arguments));
-  $Function.apply(WebViewInternal.insertCSS, null, args);
+  this.executeCode(WebViewInternal.insertCSS, $Array.slice(arguments));
 };
 
 // Indicates whether or not the webview's user agent string has been overridden.
 WebViewImpl.prototype.isUserAgentOverridden = function() {
   return !!this.userAgentOverride &&
       this.userAgentOverride != navigator.userAgent;
 };
 
 // Prints the contents of the webview.
 WebViewImpl.prototype.print = function() {
@@ skipping 113 matching lines @@
     internal.reset();
   };
 
   proto.attachedCallback = function() {
     var internal = privates(this).internal;
     if (!internal) {
       return;
     }
     if (!internal.elementAttached) {
       internal.elementAttached = true;
-      internal.parseAttributes();
+      internal.parseSrcAttribute();
     }
   };
 
   // Public-facing API methods.
   var methods = [
     'back',
     'canGoBack',
     'canGoForward',
     'clearData',
     'executeScript',
@@ skipping 49 matching lines @@
   registerBrowserPluginElement();
   registerWebViewElement();
   window.removeEventListener(event.type, listener, useCapture);
 }, useCapture);
 
 // Implemented when the ChromeWebView API is available.
 WebViewImpl.prototype.maybeGetChromeWebViewEvents = function() {};
 
 // Implemented when the experimental WebView API is available.
 WebViewImpl.maybeGetExperimentalAPIs = function() {};
-WebViewImpl.prototype.maybeGetExperimentalEvents = function() {};
 WebViewImpl.prototype.setupExperimentalContextMenus = function() {};
 
 // Exports.
 exports.WebViewImpl = WebViewImpl;
 exports.WebViewInternal = WebViewInternal;