From dbe9893d297c286d81c814ed39784a2a2ae5c28f Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 6 Mar 2017 11:23:28 -0800
Subject: [PATCH] Assign Promise.resolve to constant

---
 lib/renderer/api/remote.js | 5 ++---
 lib/renderer/init.js       | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/renderer/api/remote.js b/lib/renderer/api/remote.js
index e524ecc72086..fd94390d7725 100644
--- a/lib/renderer/api/remote.js
+++ b/lib/renderer/api/remote.js
@@ -3,6 +3,7 @@
 const {Buffer} = require('buffer')
 const v8Util = process.atomBinding('v8_util')
 const {ipcRenderer, isPromise, CallbacksRegistry} = require('electron')
+const resolvePromise = Promise.resolve.bind(Promise)
 
 const callbacksRegistry = new CallbacksRegistry()
 
@@ -207,9 +208,7 @@ const metaToValue = function (meta) {
     case 'buffer':
       return Buffer.from(meta.value)
     case 'promise':
-      return Promise.resolve({
-        then: metaToValue(meta.then)
-      })
+      return resolvePromise({then: metaToValue(meta.then)})
     case 'error':
       return metaToPlainObject(meta)
     case 'date':
diff --git a/lib/renderer/init.js b/lib/renderer/init.js
index d9a05592e999..24e19b9d2a60 100644
--- a/lib/renderer/init.js
+++ b/lib/renderer/init.js
@@ -3,6 +3,7 @@
 const events = require('events')
 const path = require('path')
 const Module = require('module')
+const resolvePromise = Promise.resolve.bind(Promise)
 
 // We modified the original process.argv to let node.js load the
 // atom-renderer.js, we need to restore it here.
@@ -39,7 +40,7 @@ electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_SYNC_WEB_FRAME_METHOD', (eve
 
 electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', (event, requestId, method, args) => {
   const responseCallback = function (result) {
-    Promise.resolve(result)
+    resolvePromise(result)
       .then((resolvedResult) => {
         event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, null, resolvedResult)
       })