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

Deep copy the options

Browse source 
Otherwise a window's options is possible to be affected by others.
This commit is contained in:
Cheng Zhao 2015-11-11 00:27:08 +08:00
parent 960d325a58
commit b807685453
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
atom/browser/lib/guest-window-manager.coffee
View file

@ -4,15 +4,24 @@ BrowserWindow = require 'browser-window'
frameToGuest = {} frameToGuest = {}
# Copy attribute of |parent| to |child| if it is not defined in |child|.
mergeOptions = (child, parent) ->
for own key, value of parent when key not in child
if typeof value is 'object'
child[key] = mergeOptions {}, value
else
child[key] = value
child
# Merge |options| with the |embedder|'s window's options. # Merge |options| with the |embedder|'s window's options.
mergeBrowserWindowOptions = (embedder, options) -> mergeBrowserWindowOptions = (embedder, options) ->
if embedder.browserWindowOptions? if embedder.browserWindowOptions?
# Inherit the original options if it is a BrowserWindow. # Inherit the original options if it is a BrowserWindow.
options.__proto__ = embedder.browserWindowOptions mergeOptions options, embedder.browserWindowOptions
else else
# Or only inherit web-preferences if it is a webview. # Or only inherit web-preferences if it is a webview.
options.webPreferences ?= {} options.webPreferences ?= {}
options.webPreferences.__proto__ = embedder.getWebPreferences() mergeOptions options.webPreferences, embedder.getWebPreferences()
options options
# Create a new guest created by |embedder| with |options|. # Create a new guest created by |embedder| with |options|.