Skip to content

/ servo

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

stylo: Fuse ServoStyleContext and ServoComputedValues #17767

Merged
merged 16 commits into from Jul 18, 2017
Merged

stylo: Fuse ServoStyleContext and ServoComputedValues #17767

merged 16 commits into from Jul 18, 2017

Conversation

@Manishearth
Copy link
Member

Manishearth commented Jul 18, 2017 •
edited by larsbergstrom

r=bholley https://bugzilla.mozilla.org/show_bug.cgi?id=1367904

This change is Reviewable
Manishearth added 15 commits Jul 17, 2017
@Manishearth
Update bindings
3343c82
@Manishearth
stylo: Create C++-side ServoComputedValues
4c5cc89
@Manishearth
stylo: Add RawOffsetArc<T>
d1c235d
@Manishearth
stylo: Use RawOffsetArc in ComputedValues
d52f04d
@Manishearth
stylo: Replace real ComputedValues with bindgenned ComputedValues2
5d78743
@Manishearth
stylo: Introduce ComputedValuesInner
04b0ae6
@Manishearth
stylo: Use ComputedValuesInner instead of ComputedValues when we don'…
808b1f5 
…t need it
@Manishearth
stylo: Make Servo Arc types use ptr to T instead of ptr to ArcInner<T>
74519cc
@Manishearth
stylo: Switch Gecko over to ServoStyleContext
89930e7
@Manishearth
stylo: Use ServoStyleContext in ServoStyleSet/ServoRestyleManager
cfad95b
@Manishearth
stylo: Flatten ServoComputedValues into ServoStyleContext
ff4bc5a 
This patch also removes the duplication of style contexts during the
restyle, because otherwise pointer equality of ServoComputedValues stops
holding (and we assert on that in a few places)
@Manishearth
stylo: Remove FFI calls for fetching style structs from ServoComputed…
e78947f 
…Values
@Manishearth
stylo: Stop using mStyleIfVisited in Servo
2a49a73
@Manishearth
stylo: Clean up GetContext, call it UpdateWithElementState
b280585
@Manishearth
Update bindings
Loading status checks…
c33fa3e
@highfive
Copy link

highfive commented Jul 18, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/gecko_bindings/sugar/ownership.rs, components/style/traversal.rs, components/style/properties/longhand/text.mako.rs, components/style/servo/selector_parser.rs, components/style/style_resolver.rs and 29 more
  • @canaltinova: components/style/gecko_bindings/sugar/ownership.rs, components/style/traversal.rs, components/style/properties/longhand/text.mako.rs, components/style/servo/selector_parser.rs, components/style/style_resolver.rs and 29 more
  • @KiChjang: components/script/dom/cssrulelist.rs, components/script_layout_interface/wrapper_traits.rs
  • @fitzgen: components/script/dom/cssrulelist.rs, components/script_layout_interface/wrapper_traits.rs
  • @emilio: components/layout/display_list_builder.rs, components/style/gecko_bindings/sugar/ownership.rs, ports/geckolib/glue.rs, components/style/traversal.rs, components/layout/table_rowgroup.rs and 49 more
@highfive
Copy link

highfive commented Jul 18, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify style, layout, and script code, but no tests are modified. Please consider adding a test!
@Manishearth
Copy link
Member Author

Manishearth commented Jul 18, 2017

@bors-servo r=bholley p=100
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

📌 Commit 3287274 has been approved by bholley
@highfive highfive assigned bholley and unassigned emilio Jul 18, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

⌛ Testing commit 3287274 with merge 4270477005e614aa2371437b00603b15b791ab48...
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

💔 Test failed - linux-dev
@Manishearth
Fix tidy
Loading status checks…
8eafe6a
@Manishearth Manishearth force-pushed the Manishearth:stylo-fuse branch from 3287274 to 8eafe6a Jul 18, 2017
@Manishearth
Copy link
Member Author

Manishearth commented Jul 18, 2017

@bors-servo r=bholley p=100
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

📌 Commit 8eafe6a has been approved by bholley
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

⌛ Testing commit 8eafe6a with merge d746aba...
bors-servo added a commit that referenced this pull request Jul 18, 2017
@bors-servo
Auto merge of #17767 - Manishearth:stylo-fuse, r=bholley
Loading status checks…
d746aba 
stylo: Fuse ServoStyleContext and ServoComputedValues

r=bholley https://bugzilla.mozilla.org/show_bug.cgi?id=1367904

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

bors-servo commented Jul 18, 2017

💔 Test failed - arm32
@Manishearth
Copy link
Member Author

Manishearth commented Jul 18, 2017

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

⚡ Previous build results for android, arm64, linux-dev, linux-rel-wpt, mac-dev-unit, windows-msvc-dev are reusable. Rebuilding only arm32, linux-rel-css, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4...
@Manishearth
Copy link
Member Author

Manishearth commented Jul 18, 2017

It's a manifest_changed failure, but:

  • I haven't touched WPT
  • The failure doesn't output a diff, so it feels like a fake failure

CI being weird? let's see.
@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: bholley
Pushing d746aba to master...
@bors-servo bors-servo merged commit 8eafe6a into servo:master Jul 18, 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
This was referenced Jul 18, 2017
Merged
Merged
bors-servo added a commit that referenced this pull request Jul 18, 2017
@bors-servo
Auto merge of #17773 - emilio:removing-the-ugly, r=manishearth
Loading status checks…
66e0657 
style: Cleanup post #17767

Reviewed in https://bugzilla.mozilla.org/show_bug.cgi?id=1381764

<!-- 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/17773)
<!-- Reviewable:end -->
@Manishearth Manishearth deleted the Manishearth:stylo-fuse branch May 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bholley bholley

Labels
S-tests-failed
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@Manishearth @highfive @bors-servo @bholley @emilio
You can’t perform that action at this time.