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.

Sign up for GitHub

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

Jump to bottom

Implement CSS3 Calc #7496

Merged
merged 23 commits into from
Sep 2, 2015
Merged

Implement CSS3 Calc #7496

merged 23 commits into from
Sep 2, 2015

Conversation

SimonSapin
Copy link
Member

This is #7185 with one commit added to make it build merged with master, which got support for the ch unit in the meantime.

Review on Reviewable

dzbarsky and others added 21 commits August 26, 2015 14:14
@dzbarsky
Implement Calc for LengthOrPercentage
9556141
@dzbarsky
Implement Calc for LengthOrPercentageOrAuto
cb4d878
@dzbarsky
Implement proper calc parsing
2bb6b45
@dzbarsky
Implement font relative and viewport relative units for calc
5df4b82
@dzbarsky
Clean up serialization and other hacks
af4d2e9
@dzbarsky
Clean up serialization code a little
64dc954
@dzbarsky
Clean up AST simplification code
cfa1e46
@dzbarsky
Properly serialize % values in calc expressions
6573e80
@dzbarsky
Simplify like terms in all sum expressions, not just toplevel calc
663e0f6
@dzbarsky
Simplify the calc AST simplification code
63d0429
@dzbarsky
Remove stray changes
67db4fb
@dzbarsky
Fix some calc parsing panics
f8bd7c4
@dzbarsky
Expand out nested products
164af05
@dzbarsky
Use the type system to enforce that product nodes are simplified away
dcac654
@dzbarsky
Get rid of some cloning
53e8f7d
@dzbarsky
Clean up some stray lines
5ac205b
@dzbarsky
Address review comments
cdae523
@dzbarsky
Add calc reftest
25829bb
@dzbarsky
Add calc parsing tests for the other properties
2591a89
@SimonSapin
Merge branch 'master' into calc
80d471d
@SimonSapin
Add support for the ch unit in calc()
b30c4f7
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 1, 2015
@SimonSapin
Copy link
Member Author

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit b30c4f7 has been approved by SimonSapin

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 1, 2015
This was referenced Sep 1, 2015
Closed
Merged
@bors-servo
Copy link
Contributor

⌛ Testing commit b30c4f7 with merge baa79ed...

bors-servo pushed a commit that referenced this pull request Sep 1, 2015
Auto merge of #7496 - servo:calc_, r=SimonSapin
baa79ed 
Implement CSS3 Calc

This is #7185 with one commit added to make it build merged with master, which got support for the `ch` unit in the meantime.

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

💔 Test failed - linux-dev

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Sep 1, 2015
@jdm
Copy link
Member

jdm commented Sep 1, 2015 

failures:
    font_size.html == font_size_ref.html

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Sep 2, 2015
@SimonSapin
Copy link
Member Author

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 9f48dcd has been approved by SimonSapin

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 2, 2015
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Sep 2, 2015
@SimonSapin
Copy link
Member Author

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit b51b7dd has been approved by SimonSapin

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 2, 2015
@bors-servo
Copy link
Contributor

⌛ Testing commit b51b7dd with merge a547ae6...

bors-servo pushed a commit that referenced this pull request Sep 2, 2015
Auto merge of #7496 - servo:calc_, r=SimonSapin
a547ae6 
Implement CSS3 Calc

This is #7185 with one commit added to make it build merged with master, which got support for the `ch` unit in the meantime.

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

☀️ Test successful - android, gonk, linux-dev, linux-rel, mac-dev-ref-unit, mac-rel-css, mac-rel-wpt

@bors-servo bors-servo merged commit b51b7dd into master Sep 2, 2015
@SimonSapin SimonSapin deleted the calc_ branch September 2, 2015 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SimonSapin SimonSapin

Labels
S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@SimonSapin @bors-servo @jdm @dzbarsky @highfive