From 93999810e7a88dc828a5a1abdafe9ad8b869b74e Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Wed, 9 Feb 2011 12:13:18 -0800 Subject: [PATCH] Bug 614649, patch 2: Tweak/repurpose some existing svg-as-an-image reftests, in light of their (intentionally) different rendering as a result of this bug's patch. r=roc a=tests --HG-- rename : layout/reftests/svg/as-image/squaredCircle-viewBox-100x100.svg => layout/reftests/svg/as-image/squaredCircle-100x100.svg rename : layout/reftests/svg/as-image/squaredCircle-viewBox-100x100.svg => layout/reftests/svg/as-image/squaredCircle-100x50.svg --- layout/reftests/svg/as-image/img-simple-3-ref.html | 11 +++++++++++ layout/reftests/svg/as-image/img-simple-3.html | 10 +++++----- layout/reftests/svg/as-image/img-simple-5-ref.html | 11 +++++++++++ layout/reftests/svg/as-image/img-simple-5.html | 3 ++- layout/reftests/svg/as-image/img-simple-7-ref.html | 10 ++++++++++ layout/reftests/svg/as-image/img-simple-7.html | 4 ++-- layout/reftests/svg/as-image/lime50x25.svg | 4 ++++ layout/reftests/svg/as-image/reftest.list | 6 +++--- .../reftests/svg/as-image/squaredCircle-100x100.svg | 6 ++++++ layout/reftests/svg/as-image/squaredCircle-100x50.svg | 6 ++++++ 10 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 layout/reftests/svg/as-image/img-simple-3-ref.html create mode 100644 layout/reftests/svg/as-image/img-simple-5-ref.html create mode 100644 layout/reftests/svg/as-image/img-simple-7-ref.html create mode 100644 layout/reftests/svg/as-image/lime50x25.svg create mode 100644 layout/reftests/svg/as-image/squaredCircle-100x100.svg create mode 100644 layout/reftests/svg/as-image/squaredCircle-100x50.svg diff --git a/layout/reftests/svg/as-image/img-simple-3-ref.html b/layout/reftests/svg/as-image/img-simple-3-ref.html new file mode 100644 index 000000000000..20f291aeede1 --- /dev/null +++ b/layout/reftests/svg/as-image/img-simple-3-ref.html @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/layout/reftests/svg/as-image/img-simple-3.html b/layout/reftests/svg/as-image/img-simple-3.html index c5996a3e5f73..f20c2877ea21 100644 --- a/layout/reftests/svg/as-image/img-simple-3.html +++ b/layout/reftests/svg/as-image/img-simple-3.html @@ -1,9 +1,9 @@ - - + + diff --git a/layout/reftests/svg/as-image/img-simple-5-ref.html b/layout/reftests/svg/as-image/img-simple-5-ref.html new file mode 100644 index 000000000000..89c41763bc18 --- /dev/null +++ b/layout/reftests/svg/as-image/img-simple-5-ref.html @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/layout/reftests/svg/as-image/img-simple-5.html b/layout/reftests/svg/as-image/img-simple-5.html index 2978cf9e7fcf..a686a0a1cf02 100644 --- a/layout/reftests/svg/as-image/img-simple-5.html +++ b/layout/reftests/svg/as-image/img-simple-5.html @@ -1,5 +1,6 @@ - + + diff --git a/layout/reftests/svg/as-image/img-simple-7-ref.html b/layout/reftests/svg/as-image/img-simple-7-ref.html new file mode 100644 index 000000000000..b12f68b3f108 --- /dev/null +++ b/layout/reftests/svg/as-image/img-simple-7-ref.html @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/layout/reftests/svg/as-image/img-simple-7.html b/layout/reftests/svg/as-image/img-simple-7.html index 017e569ad958..3e0138f2023a 100644 --- a/layout/reftests/svg/as-image/img-simple-7.html +++ b/layout/reftests/svg/as-image/img-simple-7.html @@ -1,6 +1,6 @@ - - + + diff --git a/layout/reftests/svg/as-image/lime50x25.svg b/layout/reftests/svg/as-image/lime50x25.svg new file mode 100644 index 000000000000..9afc0af36259 --- /dev/null +++ b/layout/reftests/svg/as-image/lime50x25.svg @@ -0,0 +1,4 @@ + + + diff --git a/layout/reftests/svg/as-image/reftest.list b/layout/reftests/svg/as-image/reftest.list index d9d8913073fd..3b18ea41e547 100644 --- a/layout/reftests/svg/as-image/reftest.list +++ b/layout/reftests/svg/as-image/reftest.list @@ -44,11 +44,11 @@ fails == canvas-drawImage-slice-1b.html lime100x100-ref.html # XXX all edges fuz # Simple tests == img-simple-1.html lime100x100-ref.html == img-simple-2.html lime100x100-ref.html -== img-simple-3.html lime100x100-ref.html +fails-if(d2d) == img-simple-3.html img-simple-3-ref.html == img-simple-4.html lime100x100-ref.html -== img-simple-5.html lime100x100-ref.html +fails-if(d2d) == img-simple-5.html img-simple-5-ref.html == img-simple-6.html lime100x100-ref.html -== img-simple-7.html lime100x100-ref.html +fails-if(d2d) == img-simple-7.html img-simple-7-ref.html # Test with mix of and referring to the same images, # with a variety of preserveAspectRatio values in play. diff --git a/layout/reftests/svg/as-image/squaredCircle-100x100.svg b/layout/reftests/svg/as-image/squaredCircle-100x100.svg new file mode 100644 index 000000000000..42b653e1ae3a --- /dev/null +++ b/layout/reftests/svg/as-image/squaredCircle-100x100.svg @@ -0,0 +1,6 @@ + + + + diff --git a/layout/reftests/svg/as-image/squaredCircle-100x50.svg b/layout/reftests/svg/as-image/squaredCircle-100x50.svg new file mode 100644 index 000000000000..d34a1ae68ef4 --- /dev/null +++ b/layout/reftests/svg/as-image/squaredCircle-100x50.svg @@ -0,0 +1,6 @@ + + + +