first pass at standardizing; suite still passing!
This commit is contained in:
parent
f25c3d33b6
commit
4794385fac
30 changed files with 1454 additions and 1462 deletions
|
@ -1,10 +1,10 @@
|
|||
'use strict';
|
||||
'use strict'
|
||||
|
||||
const ipcMain = require('electron').ipcMain;
|
||||
const webContents = require('electron').webContents;
|
||||
const ipcMain = require('electron').ipcMain
|
||||
const webContents = require('electron').webContents
|
||||
|
||||
// Doesn't exist in early initialization.
|
||||
var webViewManager = null;
|
||||
var webViewManager = null
|
||||
|
||||
var supportedWebViewEvents = [
|
||||
'load-commit',
|
||||
|
@ -37,75 +37,75 @@ var supportedWebViewEvents = [
|
|||
'media-paused',
|
||||
'found-in-page',
|
||||
'did-change-theme-color'
|
||||
];
|
||||
]
|
||||
|
||||
var nextInstanceId = 0;
|
||||
var guestInstances = {};
|
||||
var embedderElementsMap = {};
|
||||
var reverseEmbedderElementsMap = {};
|
||||
var nextInstanceId = 0
|
||||
var guestInstances = {}
|
||||
var embedderElementsMap = {}
|
||||
var reverseEmbedderElementsMap = {}
|
||||
|
||||
// Moves the last element of array to the first one.
|
||||
var moveLastToFirst = function(list) {
|
||||
return list.unshift(list.pop());
|
||||
};
|
||||
var moveLastToFirst = function (list) {
|
||||
return list.unshift(list.pop())
|
||||
}
|
||||
|
||||
// Generate guestInstanceId.
|
||||
var getNextInstanceId = function() {
|
||||
return ++nextInstanceId;
|
||||
};
|
||||
var getNextInstanceId = function () {
|
||||
return ++nextInstanceId
|
||||
}
|
||||
|
||||
// Create a new guest instance.
|
||||
var createGuest = function(embedder, params) {
|
||||
var destroy, destroyEvents, event, fn, guest, i, id, j, len, len1, listeners;
|
||||
var createGuest = function (embedder, params) {
|
||||
var destroy, destroyEvents, event, fn, guest, i, id, j, len, len1, listeners
|
||||
if (webViewManager == null) {
|
||||
webViewManager = process.atomBinding('web_view_manager');
|
||||
webViewManager = process.atomBinding('web_view_manager')
|
||||
}
|
||||
id = getNextInstanceId(embedder);
|
||||
id = getNextInstanceId(embedder)
|
||||
guest = webContents.create({
|
||||
isGuest: true,
|
||||
partition: params.partition,
|
||||
embedder: embedder
|
||||
});
|
||||
})
|
||||
guestInstances[id] = {
|
||||
guest: guest,
|
||||
embedder: embedder
|
||||
};
|
||||
}
|
||||
|
||||
// Destroy guest when the embedder is gone or navigated.
|
||||
destroyEvents = ['will-destroy', 'crashed', 'did-navigate'];
|
||||
destroy = function() {
|
||||
destroyEvents = ['will-destroy', 'crashed', 'did-navigate']
|
||||
destroy = function () {
|
||||
if (guestInstances[id] != null) {
|
||||
return destroyGuest(embedder, id);
|
||||
return destroyGuest(embedder, id)
|
||||
}
|
||||
};
|
||||
}
|
||||
for (i = 0, len = destroyEvents.length; i < len; i++) {
|
||||
event = destroyEvents[i];
|
||||
embedder.once(event, destroy);
|
||||
event = destroyEvents[i]
|
||||
embedder.once(event, destroy)
|
||||
|
||||
// Users might also listen to the crashed event, so We must ensure the guest
|
||||
// is destroyed before users' listener gets called. It is done by moving our
|
||||
// listener to the first one in queue.
|
||||
listeners = embedder._events[event];
|
||||
listeners = embedder._events[event]
|
||||
if (Array.isArray(listeners)) {
|
||||
moveLastToFirst(listeners);
|
||||
moveLastToFirst(listeners)
|
||||
}
|
||||
}
|
||||
guest.once('destroyed', function() {
|
||||
var j, len1, results;
|
||||
results = [];
|
||||
guest.once('destroyed', function () {
|
||||
var j, len1, results
|
||||
results = []
|
||||
for (j = 0, len1 = destroyEvents.length; j < len1; j++) {
|
||||
event = destroyEvents[j];
|
||||
results.push(embedder.removeListener(event, destroy));
|
||||
event = destroyEvents[j]
|
||||
results.push(embedder.removeListener(event, destroy))
|
||||
}
|
||||
return results;
|
||||
});
|
||||
return results
|
||||
})
|
||||
|
||||
// Init guest web view after attached.
|
||||
guest.once('did-attach', function() {
|
||||
var opts;
|
||||
params = this.attachParams;
|
||||
delete this.attachParams;
|
||||
this.viewInstanceId = params.instanceId;
|
||||
guest.once('did-attach', function () {
|
||||
var opts
|
||||
params = this.attachParams
|
||||
delete this.attachParams
|
||||
this.viewInstanceId = params.instanceId
|
||||
this.setSize({
|
||||
normal: {
|
||||
width: params.elementWidth,
|
||||
|
@ -120,61 +120,60 @@ var createGuest = function(embedder, params) {
|
|||
width: params.maxwidth,
|
||||
height: params.maxheight
|
||||
}
|
||||
});
|
||||
})
|
||||
if (params.src) {
|
||||
opts = {};
|
||||
opts = {}
|
||||
if (params.httpreferrer) {
|
||||
opts.httpReferrer = params.httpreferrer;
|
||||
opts.httpReferrer = params.httpreferrer
|
||||
}
|
||||
if (params.useragent) {
|
||||
opts.userAgent = params.useragent;
|
||||
opts.userAgent = params.useragent
|
||||
}
|
||||
this.loadURL(params.src, opts);
|
||||
this.loadURL(params.src, opts)
|
||||
}
|
||||
return guest.allowPopups = params.allowpopups;
|
||||
});
|
||||
return guest.allowPopups = params.allowpopups
|
||||
})
|
||||
|
||||
// Dispatch events to embedder.
|
||||
fn = function(event) {
|
||||
return guest.on(event, function(_, ...args) {
|
||||
return embedder.send.apply(embedder, ["ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-" + guest.viewInstanceId, event].concat(args));
|
||||
});
|
||||
};
|
||||
fn = function (event) {
|
||||
return guest.on(event, function (_, ...args) {
|
||||
return embedder.send.apply(embedder, ['ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + guest.viewInstanceId, event].concat(args))
|
||||
})
|
||||
}
|
||||
for (j = 0, len1 = supportedWebViewEvents.length; j < len1; j++) {
|
||||
event = supportedWebViewEvents[j];
|
||||
fn(event);
|
||||
event = supportedWebViewEvents[j]
|
||||
fn(event)
|
||||
}
|
||||
|
||||
// Dispatch guest's IPC messages to embedder.
|
||||
guest.on('ipc-message-host', function(_, [channel, ...args]) {
|
||||
return embedder.send.apply(embedder, ["ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-" + guest.viewInstanceId, channel].concat(args));
|
||||
});
|
||||
guest.on('ipc-message-host', function (_, [channel, ...args]) {
|
||||
return embedder.send.apply(embedder, ['ATOM_SHELL_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + guest.viewInstanceId, channel].concat(args))
|
||||
})
|
||||
|
||||
// Autosize.
|
||||
guest.on('size-changed', function(_, ...args) {
|
||||
return embedder.send.apply(embedder, ["ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-" + guest.viewInstanceId].concat(args));
|
||||
});
|
||||
return id;
|
||||
};
|
||||
guest.on('size-changed', function (_, ...args) {
|
||||
return embedder.send.apply(embedder, ['ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + guest.viewInstanceId].concat(args))
|
||||
})
|
||||
return id
|
||||
}
|
||||
|
||||
// Attach the guest to an element of embedder.
|
||||
var attachGuest = function(embedder, elementInstanceId, guestInstanceId, params) {
|
||||
var guest, key, oldGuestInstanceId, ref1, webPreferences;
|
||||
guest = guestInstances[guestInstanceId].guest;
|
||||
var attachGuest = function (embedder, elementInstanceId, guestInstanceId, params) {
|
||||
var guest, key, oldGuestInstanceId, ref1, webPreferences
|
||||
guest = guestInstances[guestInstanceId].guest
|
||||
|
||||
// Destroy the old guest when attaching.
|
||||
key = (embedder.getId()) + "-" + elementInstanceId;
|
||||
oldGuestInstanceId = embedderElementsMap[key];
|
||||
key = (embedder.getId()) + '-' + elementInstanceId
|
||||
oldGuestInstanceId = embedderElementsMap[key]
|
||||
if (oldGuestInstanceId != null) {
|
||||
|
||||
// Reattachment to the same guest is not currently supported.
|
||||
if (oldGuestInstanceId === guestInstanceId) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
if (guestInstances[oldGuestInstanceId] == null) {
|
||||
return;
|
||||
return
|
||||
}
|
||||
destroyGuest(embedder, oldGuestInstanceId);
|
||||
destroyGuest(embedder, oldGuestInstanceId)
|
||||
}
|
||||
webPreferences = {
|
||||
guestInstanceId: guestInstanceId,
|
||||
|
@ -182,54 +181,54 @@ var attachGuest = function(embedder, elementInstanceId, guestInstanceId, params)
|
|||
plugins: params.plugins,
|
||||
webSecurity: !params.disablewebsecurity,
|
||||
blinkFeatures: params.blinkfeatures
|
||||
};
|
||||
if (params.preload) {
|
||||
webPreferences.preloadURL = params.preload;
|
||||
}
|
||||
webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences);
|
||||
guest.attachParams = params;
|
||||
embedderElementsMap[key] = guestInstanceId;
|
||||
return reverseEmbedderElementsMap[guestInstanceId] = key;
|
||||
};
|
||||
if (params.preload) {
|
||||
webPreferences.preloadURL = params.preload
|
||||
}
|
||||
webViewManager.addGuest(guestInstanceId, elementInstanceId, embedder, guest, webPreferences)
|
||||
guest.attachParams = params
|
||||
embedderElementsMap[key] = guestInstanceId
|
||||
return reverseEmbedderElementsMap[guestInstanceId] = key
|
||||
}
|
||||
|
||||
// Destroy an existing guest instance.
|
||||
var destroyGuest = function(embedder, id) {
|
||||
var key;
|
||||
webViewManager.removeGuest(embedder, id);
|
||||
guestInstances[id].guest.destroy();
|
||||
delete guestInstances[id];
|
||||
key = reverseEmbedderElementsMap[id];
|
||||
var destroyGuest = function (embedder, id) {
|
||||
var key
|
||||
webViewManager.removeGuest(embedder, id)
|
||||
guestInstances[id].guest.destroy()
|
||||
delete guestInstances[id]
|
||||
key = reverseEmbedderElementsMap[id]
|
||||
if (key != null) {
|
||||
delete reverseEmbedderElementsMap[id];
|
||||
return delete embedderElementsMap[key];
|
||||
delete reverseEmbedderElementsMap[id]
|
||||
return delete embedderElementsMap[key]
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_CREATE_GUEST', function(event, params, requestId) {
|
||||
return event.sender.send("ATOM_SHELL_RESPONSE_" + requestId, createGuest(event.sender, params));
|
||||
});
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params, requestId) {
|
||||
return event.sender.send('ATOM_SHELL_RESPONSE_' + requestId, createGuest(event.sender, params))
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_ATTACH_GUEST', function(event, elementInstanceId, guestInstanceId, params) {
|
||||
return attachGuest(event.sender, elementInstanceId, guestInstanceId, params);
|
||||
});
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, elementInstanceId, guestInstanceId, params) {
|
||||
return attachGuest(event.sender, elementInstanceId, guestInstanceId, params)
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_DESTROY_GUEST', function(event, id) {
|
||||
return destroyGuest(event.sender, id);
|
||||
});
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, id) {
|
||||
return destroyGuest(event.sender, id)
|
||||
})
|
||||
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_SET_SIZE', function(event, id, params) {
|
||||
var ref1;
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.guest.setSize(params) : void 0;
|
||||
});
|
||||
ipcMain.on('ATOM_SHELL_GUEST_VIEW_MANAGER_SET_SIZE', function (event, id, params) {
|
||||
var ref1
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.guest.setSize(params) : void 0
|
||||
})
|
||||
|
||||
// Returns WebContents from its guest id.
|
||||
exports.getGuest = function(id) {
|
||||
var ref1;
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.guest : void 0;
|
||||
};
|
||||
exports.getGuest = function (id) {
|
||||
var ref1
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.guest : void 0
|
||||
}
|
||||
|
||||
// Returns the embedder of the guest.
|
||||
exports.getEmbedder = function(id) {
|
||||
var ref1;
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.embedder : void 0;
|
||||
};
|
||||
exports.getEmbedder = function (id) {
|
||||
var ref1
|
||||
return (ref1 = guestInstances[id]) != null ? ref1.embedder : void 0
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue