Move ContentWindow from BrowserPlugin To GuestView

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 76 matching lines @@
 /**
  * @constructor
  */
 function WebViewInternal(webviewNode) {
   privates(webviewNode).internal = this;
   this.webviewNode = webviewNode;
   this.attached = 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;
 
   // on* Event handlers.
   this.on = {};
 
@@ skipping 52 matching lines @@
   // 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) {
     this.guestInstanceId = undefined;
     this.beforeFirstNavigation = true;
     this.validPartitionId = true;
     this.partition.validPartitionId = true;
+    this.contentWindow = null;
   }
   this.internalInstanceId = 0;
 };
 
 // Sets <webview>.request property.
 WebViewInternal.prototype.setRequestPropertyOnWebViewNode = function(request) {
   Object.defineProperty(
       this.webviewNode,
       'request',
       {
@@ skipping 233 matching lines @@
       }
       self.webviewNode.setAttribute('partition', value);
     },
     enumerable: true
   });
 
   // We cannot use {writable: true} property descriptor because we want a
   // dynamic getter value.
   Object.defineProperty(this.webviewNode, 'contentWindow', {
     get: function() {
-      if (browserPluginNode.contentWindow)
-        return browserPluginNode.contentWindow;
+      if (this.contentWindow) {
+        return this.contentWindow;
+      }
       window.console.error(ERROR_MSG_CONTENTWINDOW_NOT_AVAILABLE);
-    },
+    }.bind(this),
     // No setter.
     enumerable: true
   });
 };
 
 /**
  * @private
  */
 WebViewInternal.prototype.setupWebviewNodeAttributes = function() {
   this.setupWebViewSrcAttributeMutationObserver();
@@ skipping 132 matching lines @@
     }
 
     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);
+            params,
+            function(w) {
+          this.contentWindow = w;

[Ken Rockot(use gerrit already), 2014/09/17 21:30:37]

nit: This indentation seems a little funky to me; but if it's normal, please
ignore.

[Fady Samuel, 2014/09/17 22:05:46]

Done.

+        }.bind(this));
       }.bind(this), 0);
     }
 
     return;
   }
 
   // This observer monitors mutations to attributes of the BrowserPlugin and
   // updates the <webview> attributes accordingly.
   // |newValue| is null if the attribute |name| has been removed.
   if (newValue != null) {
@@ skipping 283 matching lines @@
 
   if (!this.isPluginInRenderTree()) {
     this.deferredAttachState = {isNewWindow: isNewWindow};
     return true;
   }
 
   this.deferredAttachState = null;
   return guestViewInternalNatives.AttachGuest(
       this.internalInstanceId,
       this.guestInstanceId,
-      params);
+      params, function(w) {
+        this.contentWindow = w;
+      }.bind(this));
 };
 
 // Registers browser plugin <object> custom element.
 function registerBrowserPluginElement() {
   var proto = Object.create(HTMLObjectElement.prototype);
 
   proto.createdCallback = function() {
     this.setAttribute('type', 'application/browser-plugin');
     this.setAttribute('id', 'browser-plugin-' + IdGenerator.GetNextId());
     // The <object> node fills in the <webview> container.
@@ skipping 145 matching lines @@
 
 /**
  * Implemented when the experimental API is available.
  * @private
  */
 WebViewInternal.prototype.setupExperimentalContextMenus = function() {
 };
 
 exports.WebView = WebView;
 exports.WebViewInternal = WebViewInternal;