Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Share prefs to content processes #10497

Merged
merged 2 commits into from Apr 13, 2016
Merged

Conversation

@kaksmet
Copy link
Contributor

kaksmet commented Apr 9, 2016

Without this ./mach run -b -- -M would start fine but navigating to a site would fail with:

thread 'ScriptThread PipelineId { namespace_id: PipelineNamespaceId(0), index: PipelineIndex(0) }' panicked at 'assertion failed: mozbrowser_enabled()', /Users/ulf/Documents/Code/servo/components/script/dom/htmliframeelement.rs:163


This change is Reviewable

@jdm
Copy link
Member

jdm commented Apr 9, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Apr 12, 2016

The latest upstream changes (presumably #10529) made this pull request unmergeable. Please resolve the merge conflicts.

kaksmet added 2 commits Apr 9, 2016
Without this `./mach run -b -- -M` would start fine but navigating to a site would fail with:

`thread 'ScriptThread PipelineId { namespace_id: PipelineNamespaceId(0), index: PipelineIndex(0) }' panicked at 'assertion failed: mozbrowser_enabled()', /Users/ulf/Documents/Code/servo/components/script/dom/htmliframeelement.rs:163`
@kaksmet kaksmet force-pushed the kaksmet:multiprocess-prefs branch from 8b7491b to c8f206d Apr 12, 2016
@pcwalton
Copy link
Contributor

pcwalton commented Apr 13, 2016

@bors-servo: r+

Nice catch!

@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2016

📌 Commit c8f206d has been approved by pcwalton

@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2016

Testing commit c8f206d with merge e8e354d...

bors-servo added a commit that referenced this pull request Apr 13, 2016
Share prefs to content processes

Without this `./mach run -b -- -M` would start fine but navigating to a site would fail with:

`thread 'ScriptThread PipelineId { namespace_id: PipelineNamespaceId(0), index: PipelineIndex(0) }' panicked at 'assertion failed: mozbrowser_enabled()', /Users/ulf/Documents/Code/servo/components/script/dom/htmliframeelement.rs:163`

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10497)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2016

💔 Test failed - linux-rel

@jdm
Copy link
Member

jdm commented Apr 13, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2016

Previous build results for android, arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt are reusable. Rebuilding only linux-rel...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 13, 2016

@bors-servo bors-servo merged commit c8f206d into servo:master Apr 13, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@kaksmet kaksmet deleted the kaksmet:multiprocess-prefs branch Apr 13, 2016
@asajeffrey asajeffrey mentioned this pull request Apr 26, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.