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

style: Inline RestyleData. #17348

Merged
merged 1 commit into from Jun 16, 2017
Merged

style: Inline RestyleData. #17348

merged 1 commit into from Jun 16, 2017

Conversation

@emilio
Copy link
Member

emilio commented Jun 15, 2017

Bug: 1368236
MozReview-Commit-ID: 49s3SO0PMHf


This change is Reviewable

@highfive
Copy link

highfive commented Jun 15, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/sharing/mod.rs, components/style/data.rs, components/style/invalidation/stylesheets.rs, components/style/invalidation/element/invalidator.rs, components/style/dom.rs and 2 more
@emilio
Copy link
Member Author

emilio commented Jun 15, 2017

@bors-servo r=bholley

@bors-servo
Copy link
Contributor

bors-servo commented Jun 15, 2017

📌 Commit ffd345c has been approved by bholley

@jdm
Copy link
Member

jdm commented Jun 15, 2017

error[E0599]: no method named `ensure_restyle` found for type `atomic_refcell::AtomicRefMut<'_, style::data::ElementData>` in the current scope
    --> C:\projects\servo\components\layout_thread\lib.rs:1119:35
     |
1119 |                                 d.ensure_restyle().hint.insert(RestyleHint::restyle_subtree());
     |                                   ^^^^^^^^^^^^^^
error[E0599]: no method named `ensure_restyle` found for type `atomic_refcell::AtomicRefMut<'_, style::data::ElementData>` in the current scope
    --> C:\projects\servo\components\layout_thread\lib.rs:1155:23
     |
1155 |                     d.ensure_restyle().hint.insert(RestyleHint::restyle_subtree());
     |                       ^^^^^^^^^^^^^^
error[E0599]: no method named `ensure_restyle` found for type `atomic_refcell::AtomicRefMut<'_, style::data::ElementData>` in the current scope
    --> C:\projects\servo\components\layout_thread\lib.rs:1200:47
     |
1200 |             let mut restyle_data = style_data.ensure_restyle();
     |                                               ^^^^^^^^^^^^^^
error: aborting due to previous error(s)
error: Could not compile `layout_thread`.
Caused by:

@bors-servo: r-

Bug: 1368236
MozReview-Commit-ID: 49s3SO0PMHf
@emilio
Copy link
Member Author

emilio commented Jun 16, 2017

Eek, thanks... I stopped cargo-check after compiling layout, but that was not enough :)

@bors-servo r=bholley

@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

📌 Commit ad4e512 has been approved by bholley

@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

Testing commit ad4e512 with merge 132561d67da8306cf93b4e1969283d0297beebe5...

@emilio emilio force-pushed the emilio:bup branch from ad4e512 to ffc45e9 Jun 16, 2017
@emilio
Copy link
Member Author

emilio commented Jun 16, 2017

@bors-servo r=bholley

@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

📌 Commit ffc45e9 has been approved by bholley

@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

Testing commit ffc45e9 with merge c8fe5a9...

bors-servo added a commit that referenced this pull request Jun 16, 2017
style: Inline RestyleData.

Bug: 1368236
MozReview-Commit-ID: 49s3SO0PMHf

<!-- 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/17348)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

💔 Test failed - linux-dev

@emilio
Copy link
Member Author

emilio commented Jun 16, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

Testing commit ffc45e9 with merge 33766b2...

bors-servo added a commit that referenced this pull request Jun 16, 2017
style: Inline RestyleData.

Bug: 1368236
MozReview-Commit-ID: 49s3SO0PMHf

<!-- 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/17348)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 16, 2017

@bors-servo bors-servo merged commit ffc45e9 into servo:master Jun 16, 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

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