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

Remove HAS_DIRTY_SIBLINGS. #8042

Merged
merged 1 commit into from Oct 21, 2015
Merged

Remove HAS_DIRTY_SIBLINGS. #8042

merged 1 commit into from Oct 21, 2015
+6 −39

Conversation

@bholley
Copy link
Contributor

bholley commented Oct 15, 2015

This isn't doing anything right now, and we're not even setting it properly
in dirty_impl the |dirty_subtree(self)| was causing us to hit the skip case
for step 3.

Review on Reviewable
@highfive
Copy link

highfive commented Oct 15, 2015

warning Warning warning

  • These commits modify layout code, but no reftests are modified. Please consider adding a reftest!
@bholley
Copy link
Contributor Author

bholley commented Oct 15, 2015

r? @pcwalton
@bholley
Copy link
Contributor Author

bholley commented Oct 15, 2015

(The proper way to handle sibling dirtying is with restyle hints, which I'm working on now)
@bors-servo
Copy link
Contributor

bors-servo commented Oct 16, 2015

☔ The latest upstream changes (presumably #8026) made this pull request unmergeable. Please resolve the merge conflicts.
@pcwalton
Copy link
Contributor

pcwalton commented Oct 16, 2015

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Oct 16, 2015

📌 Commit ad2a6e3 has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Oct 16, 2015

🔒 Merge conflict
@jdm jdm added S-needs-rebase and removed S-awaiting-merge labels Oct 16, 2015
@bholley bholley force-pushed the bholley:dirty_siblings branch from ad2a6e3 to d5d31a7 Oct 16, 2015
@bholley
Copy link
Contributor Author

bholley commented Oct 16, 2015

@pcwalton When bors makes me fix merge conflicts, is there a way for me to "carry over review", or do I need to reflag?
@jdm
Copy link
Member

jdm commented Oct 16, 2015

One of the people with reviewer privileges needs to flag it again, unfortunately.
@bholley
Copy link
Contributor Author

bholley commented Oct 16, 2015

r? @pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Oct 19, 2015

☔ The latest upstream changes (presumably #7935) made this pull request unmergeable. Please resolve the merge conflicts.
@bholley bholley force-pushed the bholley:dirty_siblings branch from d5d31a7 to d6c13a1 Oct 19, 2015
@bors-servo
Copy link
Contributor

bors-servo commented Oct 21, 2015

☔ The latest upstream changes (presumably #8041) made this pull request unmergeable. Please resolve the merge conflicts.
@bholley
Remove HAS_DIRTY_SIBLINGS.
Loading status checks…
228eff7 
This isn't doing anything right now, and we're not even setting it properly
in dirty_impl the |dirty_subtree(self)| was causing us to hit the skip case
for step 3.
@bholley bholley force-pushed the bholley:dirty_siblings branch from d6c13a1 to 228eff7 Oct 21, 2015
@pcwalton
Copy link
Contributor

pcwalton commented Oct 21, 2015

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Oct 21, 2015

📌 Commit 228eff7 has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Oct 21, 2015

⌛ Testing commit 228eff7 with merge 08d661e...
bors-servo pushed a commit that referenced this pull request Oct 21, 2015
bors-servo
Auto merge of #8042 - bholley:dirty_siblings, r=pcwalton
08d661e 
Remove HAS_DIRTY_SIBLINGS.

This isn't doing anything right now, and we're not even setting it properly
in dirty_impl the |dirty_subtree(self)| was causing us to hit the skip case
for step 3.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8042)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 21, 2015

💔 Test failed - mac-rel-wpt
@jdm
Copy link
Member

jdm commented Oct 21, 2015

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

bors-servo commented Oct 21, 2015

⌛ Testing commit 228eff7 with merge 50ec235...
bors-servo pushed a commit that referenced this pull request Oct 21, 2015
bors-servo
Auto merge of #8042 - bholley:dirty_siblings, r=pcwalton
Loading status checks…
50ec235 
Remove HAS_DIRTY_SIBLINGS.

This isn't doing anything right now, and we're not even setting it properly
in dirty_impl the |dirty_subtree(self)| was causing us to hit the skip case
for step 3.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8042)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Oct 21, 2015

💔 Test failed - mac-dev-ref-unit
@bholley
Copy link
Contributor Author

bholley commented Oct 21, 2015

@jdm another intermittent?
@frewsxcv
Copy link
Member

frewsxcv commented Oct 21, 2015

@bors-servo retry

#7785
@bors-servo
Copy link
Contributor

bors-servo commented Oct 21, 2015

⚡ Previous build results for android, gonk, linux-rel, mac-rel-wpt are reusable. Rebuilding only linux-dev, mac-dev-ref-unit, mac-rel-css...
@bors-servo
Copy link
Contributor

bors-servo commented Oct 21, 2015

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 228eff7 into servo:master Oct 21, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bholley bholley deleted the bholley:dirty_siblings branch Oct 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pcwalton pcwalton

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@bholley @highfive @bors-servo @pcwalton @jdm @frewsxcv @SimonSapin
You can’t perform that action at this time.