Auto merge of #6253 - hyowon:serialize_colour, r=nox

Fixes #4761
cc @yichoi 
r? @jdm @pcwalton

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6253)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-02 19:15:09 -05:00
commit 4b1e955069
6 changed files with 21 additions and 34 deletions

View file

@ -1,5 +0,0 @@
[2d.fillStyle.default.html]
type: testharness
[Canvas test: 2d.fillStyle.default]
expected: FAIL

View file

@ -1,5 +0,0 @@
[2d.fillStyle.get.semitransparent.html]
type: testharness
[Canvas test: 2d.fillStyle.get.semitransparent]
expected: FAIL

View file

@ -1,5 +0,0 @@
[2d.fillStyle.get.solid.html]
type: testharness
[Canvas test: 2d.fillStyle.get.solid]
expected: FAIL

View file

@ -1,5 +0,0 @@
[2d.fillStyle.get.transparent.html]
type: testharness
[Canvas test: 2d.fillStyle.get.transparent]
expected: FAIL

View file

@ -1,5 +0,0 @@
[2d.strokeStyle.default.html]
type: testharness
[Canvas test: 2d.strokeStyle.default]
expected: FAIL