Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Merge shared mem to 0.18.x #10294

Merged
merged 1 commit into from
Aug 7, 2017
Merged

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Aug 4, 2017

Fix #10292

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.

Test Plan:

Reviewer Checklist:

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

e.sender.send(messages.INITIALIZE_WINDOW,
{

const mem = muon.shared_memory.create({
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't there already a commit for this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not in 0.18.x, this PR is against 0.18.x, so it wouldn't show this diff if there was.

@bsclifton
Copy link
Member

bsclifton commented Aug 7, 2017

@bbondy this should against master since it's for the 4.4.x+ branches, right? (since we already pulled this into 0.18.x with #10266 )

Copy link
Member

@bsclifton bsclifton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++ see comments

@bsclifton
Copy link
Member

Misunderstanding on my part 😄 I don't see the changes in master yet though, so we may still want to cherry-pick this commit and PR against master

@bsclifton bsclifton merged commit c67d19c into 0.18.x Aug 7, 2017
@bsclifton bsclifton deleted the 0.18.x-shared-mem-window-renderer branch August 7, 2017 18:18
@bsclifton bsclifton added this to the 0.18.x Hotfix milestone Aug 7, 2017
@cezaraugusto
Copy link
Contributor

I'm unable to save state after this change, getting this err:

Error saving app state:  TypeError: Cannot read property 'filter' of undefined
    at payload.perWindowState.forEach (/Users/cezaraugusto/dev/browser-laptop/app/sessionStore.js:72:46)
    at Array.forEach (<anonymous>)
    at Promise (/Users/cezaraugusto/dev/browser-laptop/app/sessionStore.js:71:30)
    at Promise (<anonymous>)
    at Object.module.exports.saveAppState (/Users/cezaraugusto/dev/browser-laptop/app/sessionStore.js:65:10)
    at saveAppState (/Users/cezaraugusto/dev/browser-laptop/app/sessionStoreShutdown.js:88:23)
    at Timeout.setTimeout (/Users/cezaraugusto/dev/browser-laptop/app/sessionStoreShutdown.js:154:9)
    at ontimeout (timers.js:386:14)
    at tryOnTimeout (timers.js:250:5)
    at Timer.listOnTimeout (timers.js:214:5)

opened #10332

@bsclifton
Copy link
Member

Should be fixed after Muon version is upgraded 👍 (all branches now updated- sorry I missed that)

@cezaraugusto
Copy link
Contributor

confirmed working thanks

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants