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

Revert "Auto merge of #17701 - bholley:reuse_allocations, r=emilio" #17710

Merged
merged 1 commit into from Jul 13, 2017

Conversation

@emilio
Copy link
Member

emilio commented Jul 13, 2017

This reverts commit ebfc8f5, reversing
changes made to 5585ff2.

Animation code can reenter and create a new TLS context from the traversal
SequentialTask, so this won't work as written, and it's making test fails.


This change is Reviewable

This reverts commit ebfc8f5, reversing
changes made to 5585ff2.

Animation code can reenter and create a new TLS context from the traversal
SequentialTask, so this won't work as written.
@highfive
Copy link

highfive commented Jul 13, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/Cargo.toml, components/style/lib.rs, components/style/bloom.rs, components/style/sharing/mod.rs
  • @canaltinova: components/style/Cargo.toml, components/style/lib.rs, components/style/bloom.rs, components/style/sharing/mod.rs
  • @fitzgen: components/script/Cargo.toml
  • @KiChjang: components/script/Cargo.toml
@highfive
Copy link

highfive commented Jul 13, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@emilio
Copy link
Member Author

emilio commented Jul 13, 2017

r? @heycam

@highfive highfive assigned heycam and unassigned asajeffrey Jul 13, 2017
@heycam
Copy link
Member

heycam commented Jul 13, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jul 13, 2017

📌 Commit a34f288 has been approved by heycam

@emilio
Copy link
Member Author

emilio commented Jul 13, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jul 13, 2017

Testing commit a34f288 with merge 9d74ae8...

bors-servo added a commit that referenced this pull request Jul 13, 2017
Revert "Auto merge of #17701 - bholley:reuse_allocations, r=emilio"

This reverts commit ebfc8f5, reversing
changes made to 5585ff2.

Animation code can reenter and create a new TLS context from the traversal
SequentialTask, so this won't work as written, and it's making test fails.

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

bors-servo commented Jul 13, 2017

@bors-servo bors-servo merged commit a34f288 into servo:master Jul 13, 2017
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
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.