projects
/
platform
/
framework
/
web
/
crosswalk-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7726c7c
)
Don't allow webPreferences to be overrideden in features string
author
Kevin Sawicki
<kevinsawicki@gmail.com>
Tue, 25 Apr 2017 21:20:39 +0000
(14:20 -0700)
committer
Kevin Sawicki
<kevinsawicki@gmail.com>
Wed, 26 Apr 2017 17:56:53 +0000
(10:56 -0700)
lib/browser/guest-window-manager.js
patch
|
blob
|
history
diff --git
a/lib/browser/guest-window-manager.js
b/lib/browser/guest-window-manager.js
index
33ec15a
..
e668a31
100644
(file)
--- a/
lib/browser/guest-window-manager.js
+++ b/
lib/browser/guest-window-manager.js
@@
-202,6
+202,10
@@
ipcMain.on('ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_OPEN', (event, url, frameName,
if (value === undefined) {
additionalFeatures.push(key)
} else {
+ // Don't allow webPreferences to be set since it must be an object
+ // that cannot be directly overridden
+ if (key === 'webPreferences') return
+
if (webPreferences.includes(key)) {
if (options.webPreferences == null) {
options.webPreferences = {}