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

Acid2 2 #1988

Merged
merged 23 commits into from Apr 4, 2014
Merged

Acid2 2 #1988

merged 23 commits into from Apr 4, 2014

Conversation

@pcwalton
Copy link
Contributor

pcwalton commented Mar 28, 2014

@highfive
Copy link

highfive commented Mar 28, 2014

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
Copy link

hoppipolla-critic-bot commented Mar 28, 2014

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
Copy link
Contributor

larsbergstrom commented Mar 28, 2014

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
Copy link
Contributor Author

pcwalton commented Mar 31, 2014

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

SimonSapin added a commit to SimonSapin/servo that referenced this pull request Apr 3, 2014
SimonSapin added a commit to SimonSapin/servo that referenced this pull request Apr 3, 2014
SimonSapin added a commit to SimonSapin/servo that referenced this pull request Apr 3, 2014
@pcwalton

This comment has been minimized.

Copy link
Owner

pcwalton commented on 9e3f7a0 Apr 3, 2014

r=SimonSapin

This comment has been minimized.

Copy link

larsbergstrom replied Apr 3, 2014

@bors: retry

This comment has been minimized.

Copy link

larsbergstrom replied Apr 4, 2014

@bors: retry

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on 9e3f7a0 Apr 3, 2014

saw approval from SimonSapin
at pcwalton@9e3f7a0

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 3, 2014

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

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 3, 2014

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

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 3, 2014

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 3, 2014

saw approval from SimonSapin
at pcwalton@9e3f7a0

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 4, 2014

saw approval from SimonSapin
at pcwalton@9e3f7a0

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 4, 2014

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

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 4, 2014

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

This comment has been minimized.

Copy link
Contributor

bors-servo replied Apr 4, 2014

fast-forwarding master to auto = 3ec2215

@bors-servo bors-servo merged commit 9e3f7a0 into servo:master Apr 4, 2014
1 check passed
1 check passed
default all tests passed
bors-servo pushed a commit that referenced this pull request Jan 12, 2015
Added in #1988 but never used. r? @pcwalton
bors-servo pushed a commit that referenced this pull request Jan 12, 2015
Added in #1988 but never used. r? @pcwalton
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

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