Merge pull request #10266 from brave/0.18.x-shared-mem

Merge shared mem to 0.18.x
brave · Aug 4, 2017 · f08acea · f08acea
2 parents 5641179 + 74a5a30
commit f08acea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/js/entry.js b/js/entry.js
@@ -62,10 +62,12 @@ window.addEventListener('beforeunload', function (e) {
   ipc.send(messages.LAST_WINDOW_STATE, windowStore.getState().toJS())
 })
 
-ipc.on(messages.INITIALIZE_WINDOW, (e, windowValue, appState, frames, initWindowState) => {
+ipc.on(messages.INITIALIZE_WINDOW, (e, mem) => {
+  const message = mem.memory()
+  const windowValue = message.windowValue
   currentWindow.setWindowId(windowValue.id)
-  appStoreRenderer.state = Immutable.fromJS(appState)
+  appStoreRenderer.state = Immutable.fromJS(message.appState)
   ReactDOM.render(
-    <Window frames={frames} initWindowState={initWindowState} />,
+    <Window frames={message.frames} initWindowState={message.windowState} />,
     document.getElementById('appContainer'))
 })
diff --git a/js/stores/appStore.js b/js/stores/appStore.js
@@ -238,14 +238,17 @@ const createWindow = (action) => {
     mainWindow.webContents.on('did-finish-load', (e) => {
       lastEmittedState = appState
       mainWindow.webContents.setZoomLevel(zoomLevel[toolbarUserInterfaceScale] || 0.0)
-      e.sender.send(messages.INITIALIZE_WINDOW,
-        {
+
+      const mem = muon.shared_memory.create({
+        windowValue: {
           disposition: frameOpts.disposition,
           id: mainWindow.id
         },
-        appState.toJS(),
+        appState: appState.toJS(),
         frames,
-        action.restoredState)
+        windowState: action.restoredState})
+
+      e.sender.sendShared(messages.INITIALIZE_WINDOW, mem)
       if (action.cb) {
         action.cb()
       }