GuestView: Move lifetime management out of content

extensions/renderer/resources/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 69 matching lines @@
 // Implemented when the experimental API is available.
 WebViewInternal.maybeRegisterExperimentalAPIs = function(proto) {}
 
 /**
  * @constructor
  */
 function WebViewInternal(webviewNode) {
   privates(webviewNode).internal = this;
   this.webviewNode = webviewNode;
   this.attached = false;
+  this.pendingGuestCreation = false;
   this.elementAttached = false;
 
   this.beforeFirstNavigation = true;
   this.contentWindow = null;
   this.validPartitionId = true;
   // Used to save some state upon deferred attachment.
   // If <object> bindings is not available, we defer attachment.
   // This state contains whether or not the attachment request was for
   // newwindow.
   this.deferredAttachState = null;
@@ skipping 35 matching lines @@
  * Resets some state upon reattaching <webview> element to the DOM.
  */
 WebViewInternal.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);
     this.guestInstanceId = undefined;
     this.beforeFirstNavigation = true;
     this.validPartitionId = true;
     this.partition.validPartitionId = true;
     this.contentWindow = null;
   }
   this.internalInstanceId = 0;
 };
 
 // Sets <webview>.request property.
@@ skipping 380 matching lines @@
 
 /**
  * @private
  */
 WebViewInternal.prototype.handleBrowserPluginAttributeMutation =
     function(name, oldValue, newValue) {
   if (name == 'internalinstanceid' && !oldValue && !!newValue) {
     this.browserPluginNode.removeAttribute('internalinstanceid');
     this.internalInstanceId = parseInt(newValue);
 
-    if (!this.deferredAttachState) {
-      this.parseAttributes();
-      return;
-    }
-
     if (!!this.guestInstanceId && this.guestInstanceId != 0) {
-      window.setTimeout(function() {
-        var isNewWindow = this.deferredAttachState ?
-            this.deferredAttachState.isNewWindow : false;
-        var params = this.buildAttachParams(isNewWindow);
-        guestViewInternalNatives.AttachGuest(
-            this.internalInstanceId,
-            this.guestInstanceId,
-            params,
-            function(w) {
-              this.contentWindow = w;
-            }.bind(this)
-        );
-      }.bind(this), 0);
+      var isNewWindow = this.deferredAttachState ?
+          this.deferredAttachState.isNewWindow : false;
+      var params = this.buildAttachParams(isNewWindow);
+      guestViewInternalNatives.AttachGuest(
+          this.internalInstanceId,
+          this.guestInstanceId,
+          params,
+          function(w) {
+            this.contentWindow = w;
+          }.bind(this)
+      );
     }
 
     return;
   }
 };
 
 WebViewInternal.prototype.onSizeChanged = function(webViewEvent) {
   var newWidth = webViewEvent.newWidth;
   var newHeight = webViewEvent.newHeight;
 
@@ skipping 60 matching lines @@
 };
 
 WebViewInternal.prototype.hasNavigated = function() {
   return !this.beforeFirstNavigation;
 };
 
 /** @return {boolean} */
 WebViewInternal.prototype.parseSrcAttribute = function(result) {
   if (!this.partition.validPartitionId) {
     result.error = ERROR_MSG_INVALID_PARTITION_ATTRIBUTE;
-    return false;
+    return;
   }
   this.src = this.webviewNode.getAttribute('src');
 
   if (!this.src) {
-    return true;
-  }
-
-  if (!this.elementAttached) {
-    return true;
+    return;
   }
 
   if (!this.hasGuestInstanceID()) {
     if (this.beforeFirstNavigation) {
       this.beforeFirstNavigation = false;
-      this.allocateInstanceId();
+      this.createGuest();
     }
-    return true;
+    return;
   }
 
   // Navigate to this.src.
   WebView.navigate(this.guestInstanceId, this.src);
   return true;
 };
 
 /** @return {boolean} */
 WebViewInternal.prototype.parseAttributes = function() {
+  if (!this.elementAttached) {
+    return;
+  }
   var hasNavigated = this.hasNavigated();
   var attributeValue = this.webviewNode.getAttribute('partition');
   var result = this.partition.fromAttribute(attributeValue, hasNavigated);
-  return this.parseSrcAttribute(result);
+  this.parseSrcAttribute(result);
 };
 
 WebViewInternal.prototype.hasGuestInstanceID = function() {
   return this.guestInstanceId != undefined;
 };
 
-WebViewInternal.prototype.allocateInstanceId = function() {
+WebViewInternal.prototype.createGuest = function() {
+  if (this.pendingGuestCreation) {
+    return;
+  }
   var storagePartitionId =
       this.webviewNode.getAttribute(WEB_VIEW_ATTRIBUTE_PARTITION) ||
       this.webviewNode[WEB_VIEW_ATTRIBUTE_PARTITION];
   var params = {
     'storagePartitionId': storagePartitionId,
   };
   GuestViewInternal.createGuest(
       'webview',
       params,
       function(guestInstanceId) {
+        this.pendingGuestCreation = false;
+        if (!this.elementAttached) {
+          GuestViewInternal.destroyGuest(this.guestInstanceId);
+          return;
+        }
         this.attachWindow(guestInstanceId, false);
       }.bind(this)
   );
+  this.pendingGuestCreation = true;
 };
 
 WebViewInternal.prototype.onFrameNameChanged = function(name) {
   this.name = name || '';
   if (this.name === '') {
     this.webviewNode.removeAttribute('name');
   } else {
     this.webviewNode.setAttribute('name', this.name);
   }
 };
 
-WebViewInternal.prototype.onPluginDestroyed = function() {
-  this.reset();
-};
-
 WebViewInternal.prototype.dispatchEvent = function(webViewEvent) {
   return this.webviewNode.dispatchEvent(webViewEvent);
 };
 
 /**
  * Adds an 'on<event>' property on the webview, which can be used to set/unset
  * an event handler.
  */
 WebViewInternal.prototype.setupEventProperty = function(eventName) {
   var propertyName = 'on' + eventName.toLowerCase();
@@ skipping 29 matching lines @@
     this.ignoreNextSrcAttributeChange = true;
     this.webviewNode.setAttribute('src', newValue);
   }
 };
 
 WebViewInternal.prototype.onAttach = function(storagePartitionId) {
   this.webviewNode.setAttribute('partition', storagePartitionId);
   this.partition.fromAttribute(storagePartitionId, this.hasNavigated());
 };
 
-
 /** @private */
 WebViewInternal.prototype.getUserAgent = function() {
   return this.userAgentOverride || navigator.userAgent;
 };
 
 /** @private */
 WebViewInternal.prototype.isUserAgentOverridden = function() {
   return !!this.userAgentOverride &&
       this.userAgentOverride != navigator.userAgent;
 };
@@ skipping 230 matching lines @@
 
 /**
  * Implemented when the experimental API is available.
  * @private
  */
 WebViewInternal.prototype.setupExperimentalContextMenus = function() {
 };
 
 exports.WebView = WebView;
 exports.WebViewInternal = WebViewInternal;