Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Unified Diff: extensions/renderer/resources/guest_view/guest_view_container.js

Issue 972313002: Make <webview> use out-of-process iframe architecture. (Closed) Base URL: ssh://saopaulo.wat/mnt/dev/shared/src@testoopif2z-better-chrome
Patch Set: add basic postMessage test Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/renderer/resources/guest_view/guest_view_container.js
diff --git a/extensions/renderer/resources/guest_view/guest_view_container.js b/extensions/renderer/resources/guest_view/guest_view_container.js
index cf0e309b92a0e788b047ccc48162cefd14c8049b..cc2bcd4136d590e3c09a5cb51579d49e558372c2 100644
--- a/extensions/renderer/resources/guest_view/guest_view_container.js
+++ b/extensions/renderer/resources/guest_view/guest_view_container.js
@@ -91,6 +91,10 @@ GuestViewContainer.prototype.createBrowserPluginElement = function() {
return browserPluginElement;
};
+GuestViewContainer.prototype.getBrowserPluginElement = function() {
+ return privates(this).browserPluginElement;
+};
+
GuestViewContainer.prototype.setupFocusPropagation = function() {
if (!this.element.hasAttribute('tabIndex')) {
// GuestViewContainer needs a tabIndex in order to be focusable.
@@ -184,11 +188,17 @@ GuestViewContainer.prototype.setupAttributes = function() {};
// Registers the browser plugin <object> custom element. |viewType| is the
// name of the specific guestview container (e.g. 'webview').
function registerBrowserPluginElement(viewType) {
- var proto = $Object.create(HTMLElement.prototype);
+ var isSitePerProcess = GuestViewInternalNatives.IsSitePerProcess();
+ var proto = $Object.create(isSitePerProcess ? HTMLIFrameElement.prototype
+ : HTMLElement.prototype);
+
+ window.console.log('isSitePerProcess: ' + isSitePerProcess);
proto.createdCallback = function() {
- this.setAttribute('type', 'application/browser-plugin');
- this.setAttribute('id', 'browser-plugin-' + IdGenerator.GetNextId());
+ if (!isSitePerProcess) {
+ this.setAttribute('type', 'application/browser-plugin');
+ this.setAttribute('id', 'browser-plugin-' + IdGenerator.GetNextId());
+ }
this.style.width = '100%';
this.style.height = '100%';
};
@@ -198,17 +208,20 @@ function registerBrowserPluginElement(viewType) {
var unused = this.nonExistentAttribute;
};
- proto.attributeChangedCallback = function(name, oldValue, newValue) {
- var internal = privates(this).internal;
- if (!internal) {
- return;
- }
- internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue);
- };
+ if (!isSitePerProcess) {
+ proto.attributeChangedCallback = function(name, oldValue, newValue) {
+ var internal = privates(this).internal;
+ if (!internal) {
+ return;
+ }
+ internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue);
+ };
+ }
+ var options = {prototype: proto};
+ options.extends = isSitePerProcess ? 'iframe' : 'object';
GuestViewContainer[viewType + 'BrowserPlugin'] =
- DocumentNatives.RegisterElement(viewType + 'browserplugin',
- {extends: 'object', prototype: proto});
+ DocumentNatives.RegisterElement(viewType + 'browserplugin', options);
delete proto.createdCallback;
delete proto.attachedCallback;

Powered by Google App Engine
This is Rietveld 408576698