Auto merge of #15479 - nox:serde, r=jdm

Update various dependencies

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15479)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-02-10 12:58:44 -08:00 committed by GitHub
commit b98ccc8292
13 changed files with 53 additions and 58 deletions

View file

@ -1,4 +1,3 @@
[background-repeat-repeat-x.htm]
type: reftest
expected:
if os == "mac": FAIL
expected: FAIL

View file

@ -1,4 +1,3 @@
[background-repeat-repeat-y.htm]
type: reftest
expected:
if os == "mac": FAIL
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_direction-row-reverse.htm]
type: reftest
expected:
if os == "mac": FAIL

View file

@ -1,3 +1,4 @@
[transform-input-017.htm]
type: reftest
expected: FAIL
expected:
if os == "linux": FAIL

View file

@ -1,3 +1,4 @@
[transform-input-018.htm]
type: reftest
expected: FAIL
expected:
if os == "linux": FAIL

View file

@ -1,3 +0,0 @@
[attribute-token-selector-002.htm]
type: reftest
expected: FAIL

View file

@ -1,4 +1,3 @@
[background-repeat-repeat-x.htm]
type: reftest
expected:
if os == "mac": FAIL
expected: FAIL

View file

@ -1,4 +1,3 @@
[background-repeat-repeat-y.htm]
type: reftest
expected:
if os == "mac": FAIL
expected: FAIL

View file

@ -0,0 +1,4 @@
[c5525-fltwidth-003.htm]
type: reftest
expected:
if os == "linux": FAIL

View file

@ -1,3 +1,4 @@
[floats-028.htm]
type: reftest
expected: FAIL
expected:
if os == "mac": FAIL

View file

@ -25673,7 +25673,7 @@
"testharness"
],
"mozilla/mime_sniffing_font_context.html": [
"cd2c1b14ce7b1810f4b75148e0fa9abbfceb780d",
"1311e72e0a0dafa6fae594ca1ce2deca164acd36",
"testharness"
],
"mozilla/mozbrowser/crossorigin_xhr.html": [

View file

@ -77,7 +77,6 @@ function checkFontLoaded() {
return;
}
assert_not_equals(first.getBoundingClientRect().width, second.getBoundingClientRect().width);
assert_not_equals(first.getBoundingClientRect().height, second.getBoundingClientRect().height);
this.done();
}