Merge pull request #10025 from brave/issue-10024

use shared mem ipc to transfer history and bookmarks to about pages
brave · Jul 17, 2017 · 5e37a1d · 5e37a1d
2 parents a00d614 + f94d8ed
commit 5e37a1d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/browser/tabs.js b/app/browser/tabs.js
@@ -199,13 +199,15 @@ const updateAboutDetails = (tab, tabValue) => {
   } else if (location === 'about:bookmarks') {
     const bookmarksData = getBookmarksData(appState)
     if (bookmarksData.bookmarks) {
-      tab.send(messages.BOOKMARKS_UPDATED, bookmarksData)
+      const handle = muon.shared_memory.create(bookmarksData)
+      tab.sendShared(messages.BOOKMARKS_UPDATED, handle)
     }
   } else if (location === 'about:history') {
     if (!history) {
       appActions.populateHistory()
     } else {
-      tab.send(messages.HISTORY_UPDATED, history.toJS())
+      const handle = muon.shared_memory.create(history.toJS())
+      tab.sendShared(messages.HISTORY_UPDATED, handle)
     }
     tab.send(messages.SETTINGS_UPDATED, appSettings.toJS())
   } else if (location === 'about:extensions' && extensions) {

diff --git a/js/about/bookmarks.js b/js/about/bookmarks.js
@@ -389,7 +389,8 @@ class AboutBookmarks extends React.Component {
       selectedFolderId: 0,
       search: ''
     }
-    ipc.on(messages.BOOKMARKS_UPDATED, (e, detail) => {
+    ipc.on(messages.BOOKMARKS_UPDATED, (e, handle) => {
+      const detail = handle.memory()
       this.setState({
         bookmarks: Immutable.fromJS((detail && detail.bookmarks) || {}),
         bookmarkFolders: Immutable.fromJS((detail && detail.bookmarkFolders) || {})

diff --git a/js/about/history.js b/js/about/history.js
@@ -143,7 +143,8 @@ class AboutHistory extends React.Component {
       selection: Immutable.Set(),
       updatedStamp: undefined
     }
-    ipc.on(messages.HISTORY_UPDATED, (e, detail) => {
+    ipc.on(messages.HISTORY_UPDATED, (e, handle) => {
+      const detail = handle.memory()
       const aboutHistory = Immutable.fromJS(detail || {})
       const updatedStamp = aboutHistory.get('updatedStamp')
       // Only update if the data has changed.