From b807685453b06d3192a788c7fa24ca0fceff8f14 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 11 Nov 2015 00:27:08 +0800
Subject: [PATCH] Deep copy the options

Otherwise a window's options is possible to be affected by others.
---
 atom/browser/lib/guest-window-manager.coffee | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/atom/browser/lib/guest-window-manager.coffee b/atom/browser/lib/guest-window-manager.coffee
index f2c5fe3a43..3ed8932d44 100644
--- a/atom/browser/lib/guest-window-manager.coffee
+++ b/atom/browser/lib/guest-window-manager.coffee
@@ -4,15 +4,24 @@ BrowserWindow = require 'browser-window'
 
 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.
 mergeBrowserWindowOptions = (embedder, options) ->
   if embedder.browserWindowOptions?
     # Inherit the original options if it is a BrowserWindow.
-    options.__proto__ = embedder.browserWindowOptions
+    mergeOptions options, embedder.browserWindowOptions
   else
     # Or only inherit web-preferences if it is a webview.
     options.webPreferences ?= {}
-    options.webPreferences.__proto__ = embedder.getWebPreferences()
+    mergeOptions options.webPreferences, embedder.getWebPreferences()
   options
 
 # Create a new guest created by |embedder| with |options|.