Auto merge of #6249 - jgraham:css_meta_update, r=larsbergstrom

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6249)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-01 18:59:11 -05:00
commit aafb09e971
15 changed files with 14 additions and 22 deletions

View file

@ -1,3 +1,3 @@
[absolute-replaced-height-005.htm]
type: reftest
expected: TIMEOUT
expected: FAIL

View file

@ -1,4 +1,5 @@
[absolute-replaced-height-007.htm]
type: reftest
disabled: unstable
expected:
if (os == "linux") and (version == "Ubuntu 14.04"): FAIL

View file

@ -1,3 +1,3 @@
[absolute-replaced-height-012.htm]
type: reftest
expected: TIMEOUT
expected: FAIL

View file

@ -1,4 +0,0 @@
[absolute-replaced-height-014.htm]
type: reftest
expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL

View file

@ -1,3 +1,3 @@
[absolute-replaced-height-019.htm]
type: reftest
expected: TIMEOUT
expected: FAIL

View file

@ -1,4 +0,0 @@
[absolute-replaced-height-021.htm]
type: reftest
expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL

View file

@ -1,3 +1,3 @@
[absolute-replaced-height-026.htm]
type: reftest
expected: TIMEOUT
expected: FAIL

View file

@ -1,3 +1,3 @@
[absolute-replaced-height-033.htm]
type: reftest
expected: TIMEOUT
expected: FAIL

View file

@ -1,4 +0,0 @@
[absolute-replaced-height-035.htm]
type: reftest
expected:
if (os == "mac") and (version == "OS X 10.8.5"): FAIL

View file

@ -0,0 +1,3 @@
[background-root-102.htm]
type: reftest
disabled: unstable

View file

@ -1,3 +1,3 @@
[block-replaced-height-004.htm]
type: reftest
expected: TIMEOUT
expected: FAIL

View file

@ -1,3 +1,3 @@
[block-replaced-height-007.htm]
type: reftest
expected: TIMEOUT
expected: FAIL

View file

@ -1,3 +1,3 @@
[float-replaced-height-005.htm]
type: reftest
expected: TIMEOUT
expected: FAIL

View file

@ -1,3 +1,3 @@
[inline-block-replaced-height-005.htm]
type: reftest
expected: TIMEOUT
expected: FAIL

View file

@ -1,5 +1,5 @@
[line-height-125.htm]
type: reftest
disabled: unstable
expected:
if not debug and (os == "linux") and (version == "Ubuntu 14.04") and (processor == "x86_64") and (bits == 64): PASS
FAIL