Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Work around a compiler bug that crashes on Windows

Cheng Zhao 8 years ago
parent
9267004b53
commit
bb10551d23
3 changed files with 13 additions and 4 deletions
Split View Show Diff Stats
  1. 11 2
      atom/browser/api/atom_api_web_contents.cc
  2. 1 1
      lib/browser/chrome-extension.js
  3. 1 1
      lib/browser/guest-view-manager.js

+ 11 - 2
atom/browser/api/atom_api_web_contents.cc
View File 

@@ -266,13 +266,22 @@ WebContents::WebContents(v8::Isolate* isolate,
 
 WebContents::WebContents(v8::Isolate* isolate,
 
                          const mate::Dictionary& options)
 
     : embedder_(nullptr),
 
+      type_(BROWSER_WINDOW),
 
       request_id_(0),
 
       background_throttling_(true) {
 
   // Read options.
 
   options.Get("backgroundThrottling", &background_throttling_);
 
 
-  type_ = BROWSER_WINDOW;
 
-  options.Get("type", &type_);
 
+  // FIXME(zcbenz): We should read "type" parameter for better design, but
 
+  // on Windows we have encountered a compiler bug that if we read "type"
 
+  // from |options| and then set |type_|, a memory corruption will happen
 
+  // and Electron will soon crash.
 
+  // Remvoe this after we upgraded to use VS 2015 Update 3.
 
+  bool b = false;
 
+  if (options.Get("isGuest", &b) && b)
 
+    type_ = WEB_VIEW;
 
+  else if (options.Get("isBackgroundPage", &b) && b)
 
+    type_ = BACKGROUND_PAGE;
 
 
   // Obtain the session.
 
   std::string partition;

+ 1 - 1
lib/browser/chrome-extension.js
View File 

@@ -78,7 +78,7 @@ const startBackgroundPages = function (manifest) {
 
   const html = new Buffer(`<html><body>${scripts}</body></html>`)
 
 
   const contents = webContents.create({
 
-    type: 'backgroundPage',
 
+    isBackgroundPage: true,
 
     commandLineSwitches: ['--background-page']
 
   })
 
   backgroundPages[manifest.extensionId] = { html: html, webContents: contents }

+ 1 - 1
lib/browser/guest-view-manager.js
View File 

@@ -63,7 +63,7 @@ const createGuest = function (embedder, params) {
 
 
   const id = getNextInstanceId(embedder)
 
   const guest = webContents.create({
 
-    type: 'webview',
 
+    isGuest: true,
 
     partition: params.partition,
 
     embedder: embedder
 
   })