Acid2 2 #1988

Merged
merged 23 commits into from Apr 4, 2014

Projects

None yet

8 participants

@highfive

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • @pcwalton, please confirm that src/test/html/acid1.html and your favourite wikipedia page still render correctly!
@hoppipolla-critic-bot

Critic review: https://critic.hoppipolla.co.uk/r/1120

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@larsbergstrom

Comment from previous PR detailing areas for review:

r? @SimonSapin (style stuff and whatever you'd feel like), @larsbergstrom (graphics and whatever else you'd like), @metajack (whatever you'd like) @june0cho (tables), @hyunjunekim (pseudo-elements)

@pcwalton

Comments addressed. re-r? @SimonSapin @larsbergstrom et al

@SimonSapin SimonSapin added a commit to SimonSapin/servo that referenced this pull request Apr 3, 2014
@SimonSapin SimonSapin Adress more #1988 (Acid 2) review comments. bdc3725
@SimonSapin SimonSapin added a commit to SimonSapin/servo that referenced this pull request Apr 3, 2014
@SimonSapin SimonSapin fixup! Adress more #1988 (Acid 2) review comments. f9e8df4
@SimonSapin SimonSapin added a commit to SimonSapin/servo that referenced this pull request Apr 3, 2014
@SimonSapin SimonSapin Adress more #1988 (Acid 2) review comments. 3341cc8
pcwalton and others added some commits Mar 28, 2014
@pcwalton pcwalton style: Parse `min-height` and `max-height` e6adc54
@pcwalton pcwalton style: Implement `-servo-minimum-line-height`, a derived property from
`line-height`, and the infrastructure needed for derived properties to
work.

Eventually I would like this to be used for text decorations, like
WebKit does with `-webkit-text-decorations-in-effect`.
d136d7a
@pcwalton pcwalton style: Parse `background-position` and `background-attachment`. 1b04165
@pcwalton pcwalton util: Add some utility methods to `SmallVec`. dae4166
@pcwalton pcwalton util: Add a `rect_contains_point` utility method f8e3e50
@pcwalton pcwalton servo: Implement stacking contexts and allow multiple layers per
pipeline. This handles fixed positioning mostly correctly.
cd9d824
@pcwalton pcwalton layout: Take `min-height` and `max-height` into account 9874d0f
@pcwalton pcwalton layout: Take padding into account for inline boxes e6665a2
@pcwalton pcwalton layout: Update `parallel.rs` to use `OpaqueNodeMethods` 4fd950e
@pcwalton pcwalton layout: Support multiple boxes per node; don't store fixed/absolute
descendant links separately
98bf325
@pcwalton pcwalton layout: Implement `-servo-minimum-line-height` 392afdb
@pcwalton pcwalton layout: Rewrite the margin collapse code to work with negative margins. 10aed5b
@june0cho june0cho layout: Implement enough of automatic table layout to pass Acid2. 901c448
@hyunjunekim hyunjunekim layout: Implement pseudo-elements. 4c53a21
@pcwalton pcwalton test: Add many reftests for parts of Acid2. 42170c7
@pcwalton pcwalton support: Update submodules. 30b7f5d
@pcwalton pcwalton layout: Address review feedback. c49f23f
@pcwalton pcwalton test: Fix some reftests. 2e5b210
@pcwalton pcwalton layout: Fix percentages in relatively positioned elements aabda89
@pcwalton pcwalton layout: Address some more review comments 5609650
@pcwalton pcwalton layout: Address review comments for `min-height` and `max-height`
computation
9712e6d
@SimonSapin SimonSapin Adress more #1988 (Acid 2) review comments. 8e14579
@SimonSapin SimonSapin Computed value of 'height: <percentage>' is 'auto' in some cases.
See http://dev.w3.org/csswg/css2/visudet.html#propdef-height

This is necessary but not sufficient for #2029.

A bug fix in the previous commit "broke" Acid 2 because that bug was hiding
this one. This makes Acid 2 pass again.
9e3f7a0
@pcwalton

r=SimonSapin

saw approval from SimonSapin
at pcwalton@9e3f7a0

merging pcwalton/servo/acid2-2 = 9e3f7a0 into auto

pcwalton/servo/acid2-2 = 9e3f7a0 merged ok, testing candidate = 2bb8d37

saw approval from SimonSapin
at pcwalton@9e3f7a0

merging pcwalton/servo/acid2-2 = 9e3f7a0 into auto

pcwalton/servo/acid2-2 = 9e3f7a0 merged ok, testing candidate = 4402d0d

saw approval from SimonSapin
at pcwalton@9e3f7a0

merging pcwalton/servo/acid2-2 = 9e3f7a0 into auto

pcwalton/servo/acid2-2 = 9e3f7a0 merged ok, testing candidate = 3ec2215

fast-forwarding master to auto = 3ec2215

@bors-servo bors-servo merged commit 9e3f7a0 into servo:master Apr 4, 2014

1 check passed

default all tests passed
@bors-servo bors-servo pushed a commit that referenced this pull request Jan 12, 2015
bors-servo auto merge of #4619 : mbrubeck/servo/dead-top-margin, r=Ms2ger
Added in #1988 but never used. r? @pcwalton
b892392
@bors-servo bors-servo pushed a commit that referenced this pull request Jan 12, 2015
bors-servo auto merge of #4619 : mbrubeck/servo/dead-top-margin, r=Ms2ger
Added in #1988 but never used. r? @pcwalton
8103bba
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment