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 124 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);

[lfg, 2014/09/30 18:59:27]

If a webview element is attached and immediatelly detached, wouldn't it be
possible that the guestInstanceId wasn't allocated yet, and we could leak the
guest? I see that guestInstanceId is only assigned on a callback from
createGuest.

[Fady Samuel, 2014/09/30 22:50:03]

Fixed..I think but this code is VERY brittle now. Paul will take care of making
this code cleaner and make more sense. 

[lfg, 2014/09/30 23:29:42]

Acknowledged.

     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 122 matching lines @@
 
 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 280 matching lines @@
 
 /**
  * Implemented when the experimental API is available.
  * @private
  */
 WebViewInternal.prototype.setupExperimentalContextMenus = function() {
 };
 
 exports.WebView = WebView;
 exports.WebViewInternal = WebViewInternal;