mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #7863 from electron/coffee-script-webview-cleanup

Browse source 
Clean up CoffeeScript leftovers in webview code
This commit is contained in:
Kevin Sawicki 2016-11-07 08:53:08 -08:00 • committed by GitHub
commit a3e10aba95
5 changed files with 209 additions and 213 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
lib/browser/guest-view-manager.js
View file

@ -1,7 +1,6 @@
'use strict' 'use strict'
const ipcMain = require('electron').ipcMain const {ipcMain, webContents} = require('electron')
const webContents = require('electron').webContents
const parseFeaturesString = require('../common/parse-features-string') const parseFeaturesString = require('../common/parse-features-string')
// Doesn't exist in early initialization. // Doesn't exist in early initialization.
@ -48,7 +47,7 @@ const embedderElementsMap = {}
// Moves the last element of array to the first one. // Moves the last element of array to the first one.
const moveLastToFirst = function (list) { const moveLastToFirst = function (list) {
return list.unshift(list.pop()) list.unshift(list.pop())
} }
// Generate guestInstanceId. // Generate guestInstanceId.
@ -77,7 +76,6 @@ const createGuest = function (embedder, params) {
// Init guest web view after attached. // Init guest web view after attached.
guest.on('did-attach', function () { guest.on('did-attach', function () {
let opts
params = this.attachParams params = this.attachParams
delete this.attachParams delete this.attachParams
this.viewInstanceId = params.instanceId this.viewInstanceId = params.instanceId
@ -97,7 +95,7 @@ const createGuest = function (embedder, params) {
} }
}) })
if (params.src) { if (params.src) {
opts = {} const opts = {}
if (params.httpreferrer) { if (params.httpreferrer) {
opts.httpReferrer = params.httpreferrer opts.httpReferrer = params.httpreferrer
} }
@ -109,14 +107,17 @@ const createGuest = function (embedder, params) {
guest.allowPopups = params.allowpopups guest.allowPopups = params.allowpopups
}) })
const sendToEmbedder = (channel, ...args) => {
const embedder = getEmbedder(guestInstanceId)
if (embedder != null) {
embedder.send(`${channel}-${guest.viewInstanceId}`, ...args)
}
}
// Dispatch events to embedder. // Dispatch events to embedder.
const fn = function (event) { const fn = function (event) {
guest.on(event, function (_, ...args) { guest.on(event, function (_, ...args) {
const embedder = getEmbedder(guestInstanceId) sendToEmbedder('ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT', event, ...args)
if (!embedder) {
return
}
embedder.send.apply(embedder, ['ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + guest.viewInstanceId, event].concat(args))
}) })
} }
for (const event of supportedWebViewEvents) { for (const event of supportedWebViewEvents) {
@ -125,20 +126,12 @@ const createGuest = function (embedder, params) {
// Dispatch guest's IPC messages to embedder. // Dispatch guest's IPC messages to embedder.
guest.on('ipc-message-host', function (_, [channel, ...args]) { guest.on('ipc-message-host', function (_, [channel, ...args]) {
const embedder = getEmbedder(guestInstanceId) sendToEmbedder('ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE', channel, ...args)
if (!embedder) {
return
}
embedder.send.apply(embedder, ['ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + guest.viewInstanceId, channel].concat(args))
}) })
// Autosize. // Autosize.
guest.on('size-changed', function (_, ...args) { guest.on('size-changed', function (_, ...args) {
const embedder = getEmbedder(guestInstanceId) sendToEmbedder('ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED', ...args)
if (!embedder) {
return
}
embedder.send.apply(embedder, ['ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + guest.viewInstanceId].concat(args))
}) })
return guestInstanceId return guestInstanceId
@ -146,11 +139,9 @@ const createGuest = function (embedder, params) {
// Attach the guest to an element of embedder. // Attach the guest to an element of embedder.
const attachGuest = function (embedder, elementInstanceId, guestInstanceId, params) { const attachGuest = function (embedder, elementInstanceId, guestInstanceId, params) {
let guest, guestInstance, key, oldKey, oldGuestInstanceId, ref1, webPreferences
// Destroy the old guest when attaching. // Destroy the old guest when attaching.
key = (embedder.getId()) + '-' + elementInstanceId const key = `${embedder.getId()}-${elementInstanceId}`
oldGuestInstanceId = embedderElementsMap[key] const oldGuestInstanceId = embedderElementsMap[key]
if (oldGuestInstanceId != null) { if (oldGuestInstanceId != null) {
// Reattachment to the same guest is just a no-op. // Reattachment to the same guest is just a no-op.
if (oldGuestInstanceId === guestInstanceId) { if (oldGuestInstanceId === guestInstanceId) {
@ -160,24 +151,24 @@ const attachGuest = function (embedder, elementInstanceId, guestInstanceId, para
destroyGuest(embedder, oldGuestInstanceId) destroyGuest(embedder, oldGuestInstanceId)
} }
guestInstance = guestInstances[guestInstanceId] const guestInstance = guestInstances[guestInstanceId]
// If this isn't a valid guest instance then do nothing. // If this isn't a valid guest instance then do nothing.
if (!guestInstance) { if (!guestInstance) {
return return
} }
guest = guestInstance.guest const {guest} = guestInstance
// If this guest is already attached to an element then remove it // If this guest is already attached to an element then remove it
if (guestInstance.elementInstanceId) { if (guestInstance.elementInstanceId) {
oldKey = (guestInstance.embedder.getId()) + '-' + guestInstance.elementInstanceId const oldKey = `${guestInstance.embedder.getId()}-${guestInstance.elementInstanceId}`
delete embedderElementsMap[oldKey] delete embedderElementsMap[oldKey]
webViewManager.removeGuest(guestInstance.embedder, guestInstanceId) webViewManager.removeGuest(guestInstance.embedder, guestInstanceId)
guestInstance.embedder.send('ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-' + guest.viewInstanceId) guestInstance.embedder.send(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${guest.viewInstanceId}`)
} }
webPreferences = { const webPreferences = {
guestInstanceId: guestInstanceId, guestInstanceId: guestInstanceId,
nodeIntegration: (ref1 = params.nodeintegration) != null ? ref1 : false, nodeIntegration: params.nodeintegration != null ? params.nodeintegration : false,
plugins: params.plugins, plugins: params.plugins,
zoomFactor: params.zoomFactor, zoomFactor: params.zoomFactor,
webSecurity: !params.disablewebsecurity, webSecurity: !params.disablewebsecurity,
@ -217,7 +208,7 @@ const destroyGuest = function (embedder, guestInstanceId) {
return return
} }
let guestInstance = guestInstances[guestInstanceId] const guestInstance = guestInstances[guestInstanceId]
if (embedder !== guestInstance.embedder) { if (embedder !== guestInstance.embedder) {
return return
} }
@ -226,8 +217,8 @@ const destroyGuest = function (embedder, guestInstanceId) {
guestInstance.guest.destroy() guestInstance.guest.destroy()
delete guestInstances[guestInstanceId] delete guestInstances[guestInstanceId]
const key = embedder.getId() + '-' + guestInstance.elementInstanceId const key = `${embedder.getId()}-${guestInstance.elementInstanceId}`
return delete embedderElementsMap[key] delete embedderElementsMap[key]
} }
// Once an embedder has had a guest attached we watch it for destruction to // Once an embedder has had a guest attached we watch it for destruction to
@ -268,7 +259,7 @@ const watchEmbedder = function (embedder) {
} }
ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params, requestId) { ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', function (event, params, requestId) {
event.sender.send('ELECTRON_RESPONSE_' + requestId, createGuest(event.sender, params)) event.sender.send(`ELECTRON_RESPONSE_${requestId}`, createGuest(event.sender, params))
}) })
ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, elementInstanceId, guestInstanceId, params) { ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', function (event, elementInstanceId, guestInstanceId, params) {
@ -280,19 +271,21 @@ ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', function (event, guestIn
}) })
ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', function (event, guestInstanceId, params) { ipcMain.on('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', function (event, guestInstanceId, params) {
const guestInstance = guestInstances[guestInstanceId] const guest = getGuest(guestInstanceId)
return guestInstance != null ? guestInstance.guest.setSize(params) : void 0 if (guest != null) guest.setSize(params)
}) })
// Returns WebContents from its guest id. // Returns WebContents from its guest id.
exports.getGuest = function (guestInstanceId) { const getGuest = function (guestInstanceId) {
const guestInstance = guestInstances[guestInstanceId] const guestInstance = guestInstances[guestInstanceId]
return guestInstance != null ? guestInstance.guest : void 0 if (guestInstance != null) return guestInstance.guest
} }
// Returns the embedder of the guest. // Returns the embedder of the guest.
const getEmbedder = function (guestInstanceId) { const getEmbedder = function (guestInstanceId) {
const guestInstance = guestInstances[guestInstanceId] const guestInstance = guestInstances[guestInstanceId]
return guestInstance != null ? guestInstance.embedder : void 0 if (guestInstance != null) return guestInstance.embedder
} }
exports.getGuest = getGuest
exports.getEmbedder = getEmbedder exports.getEmbedder = getEmbedder

68
lib/renderer/web-view/guest-view-internal.js
View file

@ -1,11 +1,10 @@
'use strict' 'use strict'
const ipcRenderer = require('electron').ipcRenderer const {ipcRenderer, webFrame} = require('electron')
const webFrame = require('electron').webFrame
var requestId = 0 let requestId = 0
var WEB_VIEW_EVENTS = { const WEB_VIEW_EVENTS = {
'load-commit': ['url', 'isMainFrame'], 'load-commit': ['url', 'isMainFrame'],
'did-attach': [], 'did-attach': [],
'did-finish-load': [], 'did-finish-load': [],
@ -40,79 +39,74 @@ var WEB_VIEW_EVENTS = {
'update-target-url': ['url'] 'update-target-url': ['url']
} }
var DEPRECATED_EVENTS = { const DEPRECATED_EVENTS = {
'page-title-updated': 'page-title-set' 'page-title-updated': 'page-title-set'
} }
var dispatchEvent = function (webView, eventName, eventKey, ...args) { const dispatchEvent = function (webView, eventName, eventKey, ...args) {
var domEvent, f, i, j, len, ref1
if (DEPRECATED_EVENTS[eventName] != null) { if (DEPRECATED_EVENTS[eventName] != null) {
dispatchEvent.apply(null, [webView, DEPRECATED_EVENTS[eventName], eventKey].concat(args)) dispatchEvent(webView, DEPRECATED_EVENTS[eventName], eventKey, ...args)
}
domEvent = new Event(eventName)
ref1 = WEB_VIEW_EVENTS[eventKey]
for (i = j = 0, len = ref1.length; j < len; i = ++j) {
f = ref1[i]
domEvent[f] = args[i]
} }
const domEvent = new Event(eventName)
WEB_VIEW_EVENTS[eventKey].forEach((prop, index) => {
domEvent[prop] = args[index]
})
webView.dispatchEvent(domEvent) webView.dispatchEvent(domEvent)
if (eventName === 'load-commit') { if (eventName === 'load-commit') {
return webView.onLoadCommit(domEvent) webView.onLoadCommit(domEvent)
} }
} }
module.exports = { module.exports = {
registerEvents: function (webView, viewInstanceId) { registerEvents: function (webView, viewInstanceId) {
ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-' + viewInstanceId, function () { ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`, function () {
var domEvent
webFrame.detachGuest(webView.internalInstanceId) webFrame.detachGuest(webView.internalInstanceId)
webView.guestInstanceId = undefined webView.guestInstanceId = undefined
webView.reset() webView.reset()
domEvent = new Event('destroyed') const domEvent = new Event('destroyed')
webView.dispatchEvent(domEvent) webView.dispatchEvent(domEvent)
}) })
ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + viewInstanceId, function (event, eventName, ...args) { ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`, function (event, eventName, ...args) {
dispatchEvent.apply(null, [webView, eventName, eventName].concat(args)) dispatchEvent(webView, eventName, eventName, ...args)
}) })
ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + viewInstanceId, function (event, channel, ...args) { ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`, function (event, channel, ...args) {
var domEvent = new Event('ipc-message') const domEvent = new Event('ipc-message')
domEvent.channel = channel domEvent.channel = channel
domEvent.args = args domEvent.args = args
webView.dispatchEvent(domEvent) webView.dispatchEvent(domEvent)
}) })
return ipcRenderer.on('ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + viewInstanceId, function (event, ...args) { ipcRenderer.on(`ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-${viewInstanceId}`, function (event, ...args) {
var domEvent, f, i, j, len, ref1 const domEvent = new Event('size-changed')
domEvent = new Event('size-changed') const props = ['oldWidth', 'oldHeight', 'newWidth', 'newHeight']
ref1 = ['oldWidth', 'oldHeight', 'newWidth', 'newHeight'] for (let i = 0; i < props.length; i++) {
for (i = j = 0, len = ref1.length; j < len; i = ++j) { const prop = props[i]
f = ref1[i] domEvent[prop] = args[i]
domEvent[f] = args[i]
} }
webView.onSizeChanged(domEvent) webView.onSizeChanged(domEvent)
}) })
}, },
deregisterEvents: function (viewInstanceId) { deregisterEvents: function (viewInstanceId) {
ipcRenderer.removeAllListeners('ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-' + viewInstanceId) ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_DESTROY_GUEST-${viewInstanceId}`)
ipcRenderer.removeAllListeners('ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-' + viewInstanceId) ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-${viewInstanceId}`)
ipcRenderer.removeAllListeners('ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-' + viewInstanceId) ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_IPC_MESSAGE-${viewInstanceId}`)
return ipcRenderer.removeAllListeners('ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-' + viewInstanceId) ipcRenderer.removeAllListeners(`ELECTRON_GUEST_VIEW_INTERNAL_SIZE_CHANGED-${viewInstanceId}`)
}, },
createGuest: function (params, callback) { createGuest: function (params, callback) {
requestId++ requestId++
ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', params, requestId) ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_CREATE_GUEST', params, requestId)
return ipcRenderer.once('ELECTRON_RESPONSE_' + requestId, callback) ipcRenderer.once(`ELECTRON_RESPONSE_${requestId}`, callback)
}, },
attachGuest: function (elementInstanceId, guestInstanceId, params) { attachGuest: function (elementInstanceId, guestInstanceId, params) {
ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', elementInstanceId, guestInstanceId, params) ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_ATTACH_GUEST', elementInstanceId, guestInstanceId, params)
return webFrame.attachGuest(elementInstanceId) webFrame.attachGuest(elementInstanceId)
}, },
destroyGuest: function (guestInstanceId) { destroyGuest: function (guestInstanceId) {
return ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', guestInstanceId) ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_DESTROY_GUEST', guestInstanceId)
}, },
setSize: function (guestInstanceId, params) { setSize: function (guestInstanceId, params) {
return ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', guestInstanceId, params) ipcRenderer.send('ELECTRON_GUEST_VIEW_MANAGER_SET_SIZE', guestInstanceId, params)
} }
} }

60
lib/renderer/web-view/web-view-attributes.js
View file

@ -3,12 +3,12 @@
const WebViewImpl = require('./web-view') const WebViewImpl = require('./web-view')
const guestViewInternal = require('./guest-view-internal') const guestViewInternal = require('./guest-view-internal')
const webViewConstants = require('./web-view-constants') const webViewConstants = require('./web-view-constants')
const remote = require('electron').remote const {remote} = require('electron')
// Helper function to resolve url set in attribute. // Helper function to resolve url set in attribute.
var a = document.createElement('a') const a = document.createElement('a')
var resolveURL = function (url) { const resolveURL = function (url) {
if (url === '') return '' if (url === '') return ''
a.href = url a.href = url
return a.href return a.href
@ -32,7 +32,7 @@ class WebViewAttribute {
// Sets the attribute's value. // Sets the attribute's value.
setValue (value) { setValue (value) {
return this.webViewImpl.webviewNode.setAttribute(this.name, value || '') this.webViewImpl.webviewNode.setAttribute(this.name, value || '')
} }
// Changes the attribute's value without triggering its mutation handler. // Changes the attribute's value without triggering its mutation handler.
@ -66,10 +66,10 @@ class BooleanAttribute extends WebViewAttribute {
} }
setValue (value) { setValue (value) {
if (!value) { if (value) {
return this.webViewImpl.webviewNode.removeAttribute(this.name) this.webViewImpl.webviewNode.setAttribute(this.name, '')
} else { } else {
return this.webViewImpl.webviewNode.setAttribute(this.name, '') this.webViewImpl.webviewNode.removeAttribute(this.name)
} }
} }
} }
@ -84,7 +84,7 @@ class AutosizeDimensionAttribute extends WebViewAttribute {
if (!this.webViewImpl.guestInstanceId) { if (!this.webViewImpl.guestInstanceId) {
return return
} }
return guestViewInternal.setSize(this.webViewImpl.guestInstanceId, { guestViewInternal.setSize(this.webViewImpl.guestInstanceId, {
enableAutoSize: this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue(), enableAutoSize: this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue(),
min: { min: {
width: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() || 0), width: parseInt(this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() || 0),
@ -125,7 +125,7 @@ class PartitionAttribute extends WebViewAttribute {
} }
if (newValue === 'persist:') { if (newValue === 'persist:') {
this.validPartitionId = false this.validPartitionId = false
return window.console.error(webViewConstants.ERROR_MSG_INVALID_PARTITION_ATTRIBUTE) window.console.error(webViewConstants.ERROR_MSG_INVALID_PARTITION_ATTRIBUTE)
} }
} }
} }
@ -141,18 +141,15 @@ class GuestInstanceAttribute extends WebViewAttribute {
if (this.webViewImpl.webviewNode.hasAttribute(this.name)) { if (this.webViewImpl.webviewNode.hasAttribute(this.name)) {
return parseInt(this.webViewImpl.webviewNode.getAttribute(this.name)) return parseInt(this.webViewImpl.webviewNode.getAttribute(this.name))
} }
return undefined
} }
// Sets the attribute's value. // Sets the attribute's value.
setValue (value) { setValue (value) {
if (!value) { if (!value) {
return this.webViewImpl.webviewNode.removeAttribute(this.name) this.webViewImpl.webviewNode.removeAttribute(this.name)
} else if (!isNaN(value)) {
this.webViewImpl.webviewNode.setAttribute(this.name, value)
} }
if (isNaN(value)) {
return
}
return this.webViewImpl.webviewNode.setAttribute(this.name, value)
} }
handleMutation (oldValue, newValue) { handleMutation (oldValue, newValue) {
@ -192,7 +189,7 @@ class SrcAttribute extends WebViewAttribute {
// is possible for this change to get picked up asyncronously by src's // is possible for this change to get picked up asyncronously by src's
// mutation observer |observer|, and then get handled even though we do not // mutation observer |observer|, and then get handled even though we do not
// want to handle this mutation. // want to handle this mutation.
return this.observer.takeRecords() this.observer.takeRecords()
} }
handleMutation (oldValue, newValue) { handleMutation (oldValue, newValue) {
@ -206,7 +203,7 @@ class SrcAttribute extends WebViewAttribute {
this.setValueIgnoreMutation(oldValue) this.setValueIgnoreMutation(oldValue)
return return
} }
return this.parse() this.parse()
} }
// The purpose of this mutation observer is to catch assignment to the src // The purpose of this mutation observer is to catch assignment to the src
@ -214,29 +211,25 @@ class SrcAttribute extends WebViewAttribute {
// where the webview guest has crashed and navigating to the same address // where the webview guest has crashed and navigating to the same address
// spawns off a new process. // spawns off a new process.
setupMutationObserver () { setupMutationObserver () {
var params
this.observer = new MutationObserver((mutations) => { this.observer = new MutationObserver((mutations) => {
var i, len, mutation, newValue, oldValue for (const mutation of mutations) {
for (i = 0, len = mutations.length; i < len; i++) { const {oldValue} = mutation
mutation = mutations[i] const newValue = this.getValue()
oldValue = mutation.oldValue
newValue = this.getValue()
if (oldValue !== newValue) { if (oldValue !== newValue) {
return return
} }
this.handleMutation(oldValue, newValue) this.handleMutation(oldValue, newValue)
} }
}) })
params = { const params = {
attributes: true, attributes: true,
attributeOldValue: true, attributeOldValue: true,
attributeFilter: [this.name] attributeFilter: [this.name]
} }
return this.observer.observe(this.webViewImpl.webviewNode, params) this.observer.observe(this.webViewImpl.webviewNode, params)
} }
parse () { parse () {
var guestContents, httpreferrer, opts, useragent
if (!this.webViewImpl.elementAttached || !this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_PARTITION].validPartitionId || !this.getValue()) { if (!this.webViewImpl.elementAttached || !this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_PARTITION].validPartitionId || !this.getValue()) {
return return
} }
@ -249,17 +242,17 @@ class SrcAttribute extends WebViewAttribute {
} }
// Navigate to |this.src|. // Navigate to |this.src|.
opts = {} const opts = {}
httpreferrer = this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER].getValue() const httpreferrer = this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_HTTPREFERRER].getValue()
if (httpreferrer) { if (httpreferrer) {
opts.httpReferrer = httpreferrer opts.httpReferrer = httpreferrer
} }
useragent = this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_USERAGENT].getValue() const useragent = this.webViewImpl.attributes[webViewConstants.ATTRIBUTE_USERAGENT].getValue()
if (useragent) { if (useragent) {
opts.userAgent = useragent opts.userAgent = useragent
} }
guestContents = remote.getGuestWebContents(this.webViewImpl.guestInstanceId) const guestContents = remote.getGuestWebContents(this.webViewImpl.guestInstanceId)
return guestContents.loadURL(this.getValue(), opts) guestContents.loadURL(this.getValue(), opts)
} }
} }
@ -284,12 +277,11 @@ class PreloadAttribute extends WebViewAttribute {
} }
getValue () { getValue () {
var preload, protocol
if (!this.webViewImpl.webviewNode.hasAttribute(this.name)) { if (!this.webViewImpl.webviewNode.hasAttribute(this.name)) {
return this.value return this.value
} }
preload = resolveURL(this.webViewImpl.webviewNode.getAttribute(this.name)) let preload = resolveURL(this.webViewImpl.webviewNode.getAttribute(this.name))
protocol = preload.substr(0, 5) const protocol = preload.substr(0, 5)
if (protocol !== 'file:') { if (protocol !== 'file:') {
console.error(webViewConstants.ERROR_MSG_INVALID_PRELOAD_ATTRIBUTE) console.error(webViewConstants.ERROR_MSG_INVALID_PRELOAD_ATTRIBUTE)
preload = '' preload = ''

181
lib/renderer/web-view/web-view.js
View file

@ -1,26 +1,23 @@
'use strict' 'use strict'
const webFrame = require('electron').webFrame const {ipcRenderer, remote, webFrame} = require('electron')
const remote = require('electron').remote
const ipcRenderer = require('electron').ipcRenderer
const v8Util = process.atomBinding('v8_util') const v8Util = process.atomBinding('v8_util')
const guestViewInternal = require('./guest-view-internal') const guestViewInternal = require('./guest-view-internal')
const webViewConstants = require('./web-view-constants') const webViewConstants = require('./web-view-constants')
var hasProp = {}.hasOwnProperty const hasProp = {}.hasOwnProperty
// ID generator. // ID generator.
var nextId = 0 let nextId = 0
var getNextId = function () { const getNextId = function () {
return ++nextId return ++nextId
} }
// Represents the internal state of the WebView node. // Represents the internal state of the WebView node.
var WebViewImpl = (function () { class WebViewImpl {
function WebViewImpl (webviewNode) { constructor (webviewNode) {
var shadowRoot
this.webviewNode = webviewNode this.webviewNode = webviewNode
v8Util.setHiddenValue(this.webviewNode, 'internal', this) v8Util.setHiddenValue(this.webviewNode, 'internal', this)
this.attached = false this.attached = false
@ -30,7 +27,7 @@ var WebViewImpl = (function () {
// on* Event handlers. // on* Event handlers.
this.on = {} this.on = {}
this.browserPluginNode = this.createBrowserPluginNode() this.browserPluginNode = this.createBrowserPluginNode()
shadowRoot = this.webviewNode.createShadowRoot() const shadowRoot = this.webviewNode.createShadowRoot()
shadowRoot.innerHTML = '<!DOCTYPE html><style type="text/css">:host { display: flex; }</style>' shadowRoot.innerHTML = '<!DOCTYPE html><style type="text/css">:host { display: flex; }</style>'
this.setupWebViewAttributes() this.setupWebViewAttributes()
this.setupFocusPropagation() this.setupFocusPropagation()
@ -49,16 +46,16 @@ var WebViewImpl = (function () {
ipcRenderer.on('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', this.onVisibilityChanged) ipcRenderer.on('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', this.onVisibilityChanged)
} }
WebViewImpl.prototype.createBrowserPluginNode = function () { createBrowserPluginNode () {
// We create BrowserPlugin as a custom element in order to observe changes // We create BrowserPlugin as a custom element in order to observe changes
// to attributes synchronously. // to attributes synchronously.
var browserPluginNode = new WebViewImpl.BrowserPlugin() const browserPluginNode = new WebViewImpl.BrowserPlugin()
v8Util.setHiddenValue(browserPluginNode, 'internal', this) v8Util.setHiddenValue(browserPluginNode, 'internal', this)
return browserPluginNode return browserPluginNode
} }
// Resets some state upon reattaching <webview> element to the DOM. // Resets some state upon reattaching <webview> element to the DOM.
WebViewImpl.prototype.reset = function () { reset () {
// Unlisten the zoom-level-changed event. // Unlisten the zoom-level-changed event.
webFrame.removeListener('zoom-level-changed', this.onZoomLevelChanged) webFrame.removeListener('zoom-level-changed', this.onZoomLevelChanged)
ipcRenderer.removeListener('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', this.onVisibilityChanged) ipcRenderer.removeListener('ELECTRON_RENDERER_WINDOW_VISIBILITY_CHANGE', this.onVisibilityChanged)
@ -81,14 +78,14 @@ var WebViewImpl = (function () {
} }
// Sets the <webview>.request property. // Sets the <webview>.request property.
WebViewImpl.prototype.setRequestPropertyOnWebViewNode = function (request) { setRequestPropertyOnWebViewNode (request) {
return Object.defineProperty(this.webviewNode, 'request', { Object.defineProperty(this.webviewNode, 'request', {
value: request, value: request,
enumerable: true enumerable: true
}) })
} }
WebViewImpl.prototype.setupFocusPropagation = function () { setupFocusPropagation () {
if (!this.webviewNode.hasAttribute('tabIndex')) { if (!this.webviewNode.hasAttribute('tabIndex')) {
// <webview> needs a tabIndex in order to be focusable. // <webview> needs a tabIndex in order to be focusable.
// TODO(fsamuel): It would be nice to avoid exposing a tabIndex attribute // TODO(fsamuel): It would be nice to avoid exposing a tabIndex attribute
@ -113,58 +110,54 @@ var WebViewImpl = (function () {
// a BrowserPlugin property will update the corresponding BrowserPlugin // a BrowserPlugin property will update the corresponding BrowserPlugin
// attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more // attribute, if necessary. See BrowserPlugin::UpdateDOMAttribute for more
// details. // details.
WebViewImpl.prototype.handleWebviewAttributeMutation = function (attributeName, oldValue, newValue) { handleWebviewAttributeMutation (attributeName, oldValue, newValue) {
if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) { if (!this.attributes[attributeName] || this.attributes[attributeName].ignoreMutation) {
return return
} }
// Let the changed attribute handle its own mutation // Let the changed attribute handle its own mutation
return this.attributes[attributeName].handleMutation(oldValue, newValue) this.attributes[attributeName].handleMutation(oldValue, newValue)
} }
WebViewImpl.prototype.handleBrowserPluginAttributeMutation = function (attributeName, oldValue, newValue) { handleBrowserPluginAttributeMutation (attributeName, oldValue, newValue) {
if (attributeName === webViewConstants.ATTRIBUTE_INTERNALINSTANCEID && !oldValue && !!newValue) { if (attributeName === webViewConstants.ATTRIBUTE_INTERNALINSTANCEID && !oldValue && !!newValue) {
this.browserPluginNode.removeAttribute(webViewConstants.ATTRIBUTE_INTERNALINSTANCEID) this.browserPluginNode.removeAttribute(webViewConstants.ATTRIBUTE_INTERNALINSTANCEID)
this.internalInstanceId = parseInt(newValue) this.internalInstanceId = parseInt(newValue)
// Track when the element resizes using the element resize callback. // Track when the element resizes using the element resize callback.
webFrame.registerElementResizeCallback(this.internalInstanceId, this.onElementResize.bind(this)) webFrame.registerElementResizeCallback(this.internalInstanceId, this.onElementResize.bind(this))
if (!this.guestInstanceId) { if (this.guestInstanceId) {
return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
} }
return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
} }
} }
WebViewImpl.prototype.onSizeChanged = function (webViewEvent) { onSizeChanged (webViewEvent) {
var maxHeight, maxWidth, minHeight, minWidth, newHeight, newWidth, node, width const {newHeight, newWidth} = webViewEvent
newWidth = webViewEvent.newWidth const node = this.webviewNode
newHeight = webViewEvent.newHeight const width = node.offsetWidth
node = this.webviewNode
width = node.offsetWidth
// Check the current bounds to make sure we do not resize <webview> // Check the current bounds to make sure we do not resize <webview>
// outside of current constraints. // outside of current constraints.
maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width const maxWidth = this.attributes[webViewConstants.ATTRIBUTE_MAXWIDTH].getValue() | width
maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width const maxHeight = this.attributes[webViewConstants.ATTRIBUTE_MAXHEIGHT].getValue() | width
minWidth = this.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() | width let minWidth = this.attributes[webViewConstants.ATTRIBUTE_MINWIDTH].getValue() | width
minHeight = this.attributes[webViewConstants.ATTRIBUTE_MINHEIGHT].getValue() | width let minHeight = this.attributes[webViewConstants.ATTRIBUTE_MINHEIGHT].getValue() | width
minWidth = Math.min(minWidth, maxWidth) minWidth = Math.min(minWidth, maxWidth)
minHeight = Math.min(minHeight, maxHeight) minHeight = Math.min(minHeight, maxHeight)
if (!this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue() || (newWidth >= minWidth && newWidth <= maxWidth && newHeight >= minHeight && newHeight <= maxHeight)) { if (!this.attributes[webViewConstants.ATTRIBUTE_AUTOSIZE].getValue() || (newWidth >= minWidth && newWidth <= maxWidth && newHeight >= minHeight && newHeight <= maxHeight)) {
node.style.width = newWidth + 'px' node.style.width = `${newWidth}px`
node.style.height = newHeight + 'px' node.style.height = `${newHeight}px`
// Only fire the DOM event if the size of the <webview> has actually // Only fire the DOM event if the size of the <webview> has actually
// changed. // changed.
return this.dispatchEvent(webViewEvent) this.dispatchEvent(webViewEvent)
} }
} }
WebViewImpl.prototype.onElementResize = function (newSize) { onElementResize (newSize) {
// Dispatch the 'resize' event. // Dispatch the 'resize' event.
var resizeEvent const resizeEvent = new Event('resize', {
resizeEvent = new Event('resize', {
bubbles: true bubbles: true
}) })
@ -177,27 +170,26 @@ var WebViewImpl = (function () {
resizeEvent.newHeight = newSize.height resizeEvent.newHeight = newSize.height
this.dispatchEvent(resizeEvent) this.dispatchEvent(resizeEvent)
if (this.guestInstanceId) { if (this.guestInstanceId) {
return guestViewInternal.setSize(this.guestInstanceId, { guestViewInternal.setSize(this.guestInstanceId, {
normal: newSize normal: newSize
}) })
} }
} }
WebViewImpl.prototype.createGuest = function () { createGuest () {
return guestViewInternal.createGuest(this.buildParams(), (event, guestInstanceId) => { return guestViewInternal.createGuest(this.buildParams(), (event, guestInstanceId) => {
this.attachGuestInstance(guestInstanceId) this.attachGuestInstance(guestInstanceId)
}) })
} }
WebViewImpl.prototype.dispatchEvent = function (webViewEvent) { dispatchEvent (webViewEvent) {
return this.webviewNode.dispatchEvent(webViewEvent) this.webviewNode.dispatchEvent(webViewEvent)
} }
// Adds an 'on<event>' property on the webview, which can be used to set/unset // Adds an 'on<event>' property on the webview, which can be used to set/unset
// an event handler. // an event handler.
WebViewImpl.prototype.setupEventProperty = function (eventName) { setupEventProperty (eventName) {
var propertyName const propertyName = `on${eventName.toLowerCase()}`
propertyName = 'on' + eventName.toLowerCase()
return Object.defineProperty(this.webviewNode, propertyName, { return Object.defineProperty(this.webviewNode, propertyName, {
get: () => { get: () => {
return this.on[propertyName] return this.on[propertyName]
@ -216,34 +208,31 @@ var WebViewImpl = (function () {
} }
// Updates state upon loadcommit. // Updates state upon loadcommit.
WebViewImpl.prototype.onLoadCommit = function (webViewEvent) { onLoadCommit (webViewEvent) {
var newValue, oldValue const oldValue = this.webviewNode.getAttribute(webViewConstants.ATTRIBUTE_SRC)
oldValue = this.webviewNode.getAttribute(webViewConstants.ATTRIBUTE_SRC) const newValue = webViewEvent.url
newValue = webViewEvent.url
if (webViewEvent.isMainFrame && (oldValue !== newValue)) { if (webViewEvent.isMainFrame && (oldValue !== newValue)) {
// Touching the src attribute triggers a navigation. To avoid // Touching the src attribute triggers a navigation. To avoid
// triggering a page reload on every guest-initiated navigation, // triggering a page reload on every guest-initiated navigation,
// we do not handle this mutation. // we do not handle this mutation.
return this.attributes[webViewConstants.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue) this.attributes[webViewConstants.ATTRIBUTE_SRC].setValueIgnoreMutation(newValue)
} }
} }
WebViewImpl.prototype.onAttach = function (storagePartitionId) { onAttach (storagePartitionId) {
return this.attributes[webViewConstants.ATTRIBUTE_PARTITION].setValue(storagePartitionId) return this.attributes[webViewConstants.ATTRIBUTE_PARTITION].setValue(storagePartitionId)
} }
WebViewImpl.prototype.buildParams = function () { buildParams () {
var attribute, attributeName, css, elementRect, params, ref1 const params = {
params = {
instanceId: this.viewInstanceId, instanceId: this.viewInstanceId,
userAgentOverride: this.userAgentOverride, userAgentOverride: this.userAgentOverride,
zoomFactor: webFrame.getZoomFactor() zoomFactor: webFrame.getZoomFactor()
} }
ref1 = this.attributes for (const attributeName in this.attributes) {
for (attributeName in ref1) { if (hasProp.call(this.attributes, attributeName)) {
if (!hasProp.call(ref1, attributeName)) continue params[attributeName] = this.attributes[attributeName].getValue()
attribute = ref1[attributeName] }
params[attributeName] = attribute.getValue()
} }
// When the WebView is not participating in layout (display:none) // When the WebView is not participating in layout (display:none)
@ -251,14 +240,14 @@ var WebViewImpl = (function () {
// However, in the case where the WebView has a fixed size we can // However, in the case where the WebView has a fixed size we can
// use that value to initially size the guest so as to avoid a relayout of // use that value to initially size the guest so as to avoid a relayout of
// the on display:block. // the on display:block.
css = window.getComputedStyle(this.webviewNode, null) const css = window.getComputedStyle(this.webviewNode, null)
elementRect = this.webviewNode.getBoundingClientRect() const elementRect = this.webviewNode.getBoundingClientRect()
params.elementWidth = parseInt(elementRect.width) || parseInt(css.getPropertyValue('width')) params.elementWidth = parseInt(elementRect.width) || parseInt(css.getPropertyValue('width'))
params.elementHeight = parseInt(elementRect.height) || parseInt(css.getPropertyValue('height')) params.elementHeight = parseInt(elementRect.height) || parseInt(css.getPropertyValue('height'))
return params return params
} }
WebViewImpl.prototype.attachGuestInstance = function (guestInstanceId) { attachGuestInstance (guestInstanceId) {
this.guestInstanceId = guestInstanceId this.guestInstanceId = guestInstanceId
this.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].setValueIgnoreMutation(guestInstanceId) this.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].setValueIgnoreMutation(guestInstanceId)
this.webContents = remote.getGuestWebContents(this.guestInstanceId) this.webContents = remote.getGuestWebContents(this.guestInstanceId)
@ -267,16 +256,14 @@ var WebViewImpl = (function () {
} }
return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams()) return guestViewInternal.attachGuest(this.internalInstanceId, this.guestInstanceId, this.buildParams())
} }
}
return WebViewImpl
})()
// Registers browser plugin <object> custom element. // Registers browser plugin <object> custom element.
var registerBrowserPluginElement = function () { const registerBrowserPluginElement = function () {
var proto = Object.create(HTMLObjectElement.prototype) const proto = Object.create(HTMLObjectElement.prototype)
proto.createdCallback = function () { proto.createdCallback = function () {
this.setAttribute('type', 'application/browser-plugin') this.setAttribute('type', 'application/browser-plugin')
this.setAttribute('id', 'browser-plugin-' + getNextId()) this.setAttribute('id', `browser-plugin-${getNextId()}`)
// The <object> node fills in the <webview> container. // The <object> node fills in the <webview> container.
this.style.flex = '1 1 auto' this.style.flex = '1 1 auto'
@ -284,10 +271,9 @@ var registerBrowserPluginElement = function () {
proto.attributeChangedCallback = function (name, oldValue, newValue) { proto.attributeChangedCallback = function (name, oldValue, newValue) {
var internal var internal
internal = v8Util.getHiddenValue(this, 'internal') internal = v8Util.getHiddenValue(this, 'internal')
if (!internal) { if (internal) {
return internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue)
} }
return internal.handleBrowserPluginAttributeMutation(name, oldValue, newValue)
} }
proto.attachedCallback = function () { proto.attachedCallback = function () {
// Load the plugin immediately. // Load the plugin immediately.
@ -300,23 +286,21 @@ var registerBrowserPluginElement = function () {
delete proto.createdCallback delete proto.createdCallback
delete proto.attachedCallback delete proto.attachedCallback
delete proto.detachedCallback delete proto.detachedCallback
return delete proto.attributeChangedCallback delete proto.attributeChangedCallback
} }
// Registers <webview> custom element. // Registers <webview> custom element.
var registerWebViewElement = function () { var registerWebViewElement = function () {
var createBlockHandler, createNonBlockHandler, i, j, len, len1, m, methods, nonblockMethods, proto const proto = Object.create(HTMLObjectElement.prototype)
proto = Object.create(HTMLObjectElement.prototype)
proto.createdCallback = function () { proto.createdCallback = function () {
return new WebViewImpl(this) return new WebViewImpl(this)
} }
proto.attributeChangedCallback = function (name, oldValue, newValue) { proto.attributeChangedCallback = function (name, oldValue, newValue) {
var internal var internal
internal = v8Util.getHiddenValue(this, 'internal') internal = v8Util.getHiddenValue(this, 'internal')
if (!internal) { if (internal) {
return internal.handleWebviewAttributeMutation(name, oldValue, newValue)
} }
return internal.handleWebviewAttributeMutation(name, oldValue, newValue)
} }
proto.detachedCallback = function () { proto.detachedCallback = function () {
var internal var internal
@ -340,14 +324,15 @@ var registerWebViewElement = function () {
internal.elementAttached = true internal.elementAttached = true
instance = internal.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].getValue() instance = internal.attributes[webViewConstants.ATTRIBUTE_GUESTINSTANCE].getValue()
if (instance) { if (instance) {
return internal.attachGuestInstance(instance) internal.attachGuestInstance(instance)
} else {
internal.attributes[webViewConstants.ATTRIBUTE_SRC].parse()
} }
return internal.attributes[webViewConstants.ATTRIBUTE_SRC].parse()
} }
} }
// Public-facing API methods. // Public-facing API methods.
methods = [ const methods = [
'getURL', 'getURL',
'loadURL', 'loadURL',
'getTitle', 'getTitle',
@ -396,7 +381,7 @@ var registerWebViewElement = function () {
'showDefinitionForSelection', 'showDefinitionForSelection',
'capturePage' 'capturePage'
] ]
nonblockMethods = [ const nonblockMethods = [
'insertCSS', 'insertCSS',
'insertText', 'insertText',
'send', 'send',
@ -407,38 +392,37 @@ var registerWebViewElement = function () {
] ]
// Forward proto.foo* method calls to WebViewImpl.foo*. // Forward proto.foo* method calls to WebViewImpl.foo*.
createBlockHandler = function (m) { const createBlockHandler = function (m) {
return function (...args) { return function (...args) {
const internal = v8Util.getHiddenValue(this, 'internal') const internal = v8Util.getHiddenValue(this, 'internal')
if (internal.webContents) { if (internal.webContents) {
return internal.webContents[m].apply(internal.webContents, args) return internal.webContents[m](...args)
} else { } else {
throw new Error(`Cannot call ${m} because the webContents is unavailable. The WebView must be attached to the DOM and the dom-ready event emitted before this method can be called.`) throw new Error(`Cannot call ${m} because the webContents is unavailable. The WebView must be attached to the DOM and the dom-ready event emitted before this method can be called.`)
} }
} }
} }
for (i = 0, len = methods.length; i < len; i++) { for (const method of methods) {
m = methods[i] proto[method] = createBlockHandler(method)
proto[m] = createBlockHandler(m)
} }
createNonBlockHandler = function (m) {
const createNonBlockHandler = function (m) {
return function (...args) { return function (...args) {
const internal = v8Util.getHiddenValue(this, 'internal') const internal = v8Util.getHiddenValue(this, 'internal')
return ipcRenderer.send.apply(ipcRenderer, ['ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', null, internal.guestInstanceId, m].concat(args)) ipcRenderer.send('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', null, internal.guestInstanceId, m, ...args)
} }
} }
for (j = 0, len1 = nonblockMethods.length; j < len1; j++) { for (const method of nonblockMethods) {
m = nonblockMethods[j] proto[method] = createNonBlockHandler(method)
proto[m] = createNonBlockHandler(m)
} }
proto.executeJavaScript = function (code, hasUserGesture, callback) { proto.executeJavaScript = function (code, hasUserGesture, callback) {
var internal = v8Util.getHiddenValue(this, 'internal') const internal = v8Util.getHiddenValue(this, 'internal')
if (typeof hasUserGesture === 'function') { if (typeof hasUserGesture === 'function') {
callback = hasUserGesture callback = hasUserGesture
hasUserGesture = false hasUserGesture = false
} }
let requestId = getNextId() const requestId = getNextId()
ipcRenderer.send('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', requestId, internal.guestInstanceId, 'executeJavaScript', code, hasUserGesture) ipcRenderer.send('ELECTRON_BROWSER_ASYNC_CALL_TO_GUEST_VIEW', requestId, internal.guestInstanceId, 'executeJavaScript', code, hasUserGesture)
ipcRenderer.once(`ELECTRON_RENDERER_ASYNC_CALL_TO_GUEST_VIEW_RESPONSE_${requestId}`, function (event, result) { ipcRenderer.once(`ELECTRON_RENDERER_ASYNC_CALL_TO_GUEST_VIEW_RESPONSE_${requestId}`, function (event, result) {
if (callback) callback(result) if (callback) callback(result)
@ -447,8 +431,7 @@ var registerWebViewElement = function () {
// WebContents associated with this webview. // WebContents associated with this webview.
proto.getWebContents = function () { proto.getWebContents = function () {
var internal = v8Util.getHiddenValue(this, 'internal') return v8Util.getHiddenValue(this, 'internal').webContents
return internal.webContents
} }
window.WebView = webFrame.registerEmbedderCustomElement('webview', { window.WebView = webFrame.registerEmbedderCustomElement('webview', {
@ -460,18 +443,18 @@ var registerWebViewElement = function () {
delete proto.createdCallback delete proto.createdCallback
delete proto.attachedCallback delete proto.attachedCallback
delete proto.detachedCallback delete proto.detachedCallback
return delete proto.attributeChangedCallback delete proto.attributeChangedCallback
} }
var useCapture = true const useCapture = true
var listener = function (event) { const listener = function (event) {
if (document.readyState === 'loading') { if (document.readyState === 'loading') {
return return
} }
registerBrowserPluginElement() registerBrowserPluginElement()
registerWebViewElement() registerWebViewElement()
return window.removeEventListener(event.type, listener, useCapture) window.removeEventListener(event.type, listener, useCapture)
} }
window.addEventListener('readystatechange', listener, true) window.addEventListener('readystatechange', listener, true)

42
spec/webview-spec.js
View file

@ -3,6 +3,7 @@ const path = require('path')
const http = require('http') const http = require('http')
const url = require('url') const url = require('url')
const {app, session, getGuestWebContents, ipcMain, BrowserWindow} = require('electron').remote const {app, session, getGuestWebContents, ipcMain, BrowserWindow} = require('electron').remote
const {closeWindow} = require('./window-helpers')
describe('<webview> tag', function () { describe('<webview> tag', function () {
this.timeout(20000) this.timeout(20000)
@ -21,10 +22,7 @@ describe('<webview> tag', function () {
document.body.appendChild(webview) document.body.appendChild(webview)
} }
webview.remove() webview.remove()
if (w) { return closeWindow(w).then(function () { w = null })
w.destroy()
w = null
}
}) })
it('works without script tag in page', function (done) { it('works without script tag in page', function (done) {
@ -1256,4 +1254,40 @@ describe('<webview> tag', function () {
document.body.appendChild(webview) document.body.appendChild(webview)
}) })
}) })
describe('DOM events', function () {
let div
beforeEach(function () {
div = document.createElement('div')
div.style.width = '100px'
div.style.height = '10px'
div.style.overflow = 'hidden'
webview.style.height = '100%'
webview.style.width = '100%'
})
afterEach(function () {
if (div != null) div.remove()
})
it('emits resize events', function (done) {
webview.addEventListener('dom-ready', function () {
div.style.width = '1234px'
div.style.height = '789px'
})
webview.addEventListener('resize', function onResize (event) {
webview.removeEventListener('resize', onResize)
assert.equal(event.newWidth, 1234)
assert.equal(event.newHeight, 789)
assert.equal(event.target, webview)
done()
})
webview.src = `file://${fixtures}/pages/a.html`
div.appendChild(webview)
document.body.appendChild(div)
})
})
}) })