From 51d834d1525d14f1e7ee96c94a72239793606180 Mon Sep 17 00:00:00 2001 From: Masatoshi Kimura Date: Fri, 29 Aug 2014 23:04:35 +0900 Subject: [PATCH] Bug 1028288: Add two reftests for globalAlpha. One just tests globalAlpha, and one tests scaling and globalAlpha. r=roc --- .../canvas-drawImage-alpha-1-ref.html | 6 +++++ .../as-image/canvas-drawImage-alpha-1.html | 22 +++++++++++++++++++ .../canvas-drawImage-alpha-2-ref.html | 6 +++++ .../as-image/canvas-drawImage-alpha-2.html | 22 +++++++++++++++++++ layout/reftests/svg/as-image/reftest.list | 4 ++++ .../as-image/squaredCircle-transparent.svg | 8 +++++++ 6 files changed, 68 insertions(+) create mode 100644 layout/reftests/svg/as-image/canvas-drawImage-alpha-1-ref.html create mode 100644 layout/reftests/svg/as-image/canvas-drawImage-alpha-1.html create mode 100644 layout/reftests/svg/as-image/canvas-drawImage-alpha-2-ref.html create mode 100644 layout/reftests/svg/as-image/canvas-drawImage-alpha-2.html create mode 100644 layout/reftests/svg/as-image/squaredCircle-transparent.svg diff --git a/layout/reftests/svg/as-image/canvas-drawImage-alpha-1-ref.html b/layout/reftests/svg/as-image/canvas-drawImage-alpha-1-ref.html new file mode 100644 index 00000000000..b2be295acb8 --- /dev/null +++ b/layout/reftests/svg/as-image/canvas-drawImage-alpha-1-ref.html @@ -0,0 +1,6 @@ + + +
+
+ + diff --git a/layout/reftests/svg/as-image/canvas-drawImage-alpha-1.html b/layout/reftests/svg/as-image/canvas-drawImage-alpha-1.html new file mode 100644 index 00000000000..ca6a362c34c --- /dev/null +++ b/layout/reftests/svg/as-image/canvas-drawImage-alpha-1.html @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/layout/reftests/svg/as-image/canvas-drawImage-alpha-2-ref.html b/layout/reftests/svg/as-image/canvas-drawImage-alpha-2-ref.html new file mode 100644 index 00000000000..563e60bb916 --- /dev/null +++ b/layout/reftests/svg/as-image/canvas-drawImage-alpha-2-ref.html @@ -0,0 +1,6 @@ + + + + + diff --git a/layout/reftests/svg/as-image/canvas-drawImage-alpha-2.html b/layout/reftests/svg/as-image/canvas-drawImage-alpha-2.html new file mode 100644 index 00000000000..ca56934f6b3 --- /dev/null +++ b/layout/reftests/svg/as-image/canvas-drawImage-alpha-2.html @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/layout/reftests/svg/as-image/reftest.list b/layout/reftests/svg/as-image/reftest.list index 22df641ee84..62eb687a200 100644 --- a/layout/reftests/svg/as-image/reftest.list +++ b/layout/reftests/svg/as-image/reftest.list @@ -46,6 +46,10 @@ skip-if(B2G) == canvas-drawImage-scale-1c.html lime100x100-ref.html fuzzy(1,2) fails-if(Android&&AndroidVersion<15&&AndroidVersion!=10) == canvas-drawImage-scale-2a.html canvas-drawImage-scale-2-ref.html fuzzy(1,2) fails-if(Android&&AndroidVersion<15&&AndroidVersion!=10) == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2-ref.html +fuzzy-if(winWidget&&!d2d,1,10000) fuzzy-if(Android||B2G,1,10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1-ref.html +#Same as scale-2a but with globalAlpha: +fuzzy(1,2) fuzzy-if(winWidget&&!d2d,1,40000) fuzzy-if(Android||B2G,1,40000) fails-if(Android&&AndroidVersion<15&&AndroidVersion!=10) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html + skip-if(B2G) == canvas-drawImage-slice-1a.html lime100x100-ref.html == canvas-drawImage-slice-1b.html lime100x100-ref.html diff --git a/layout/reftests/svg/as-image/squaredCircle-transparent.svg b/layout/reftests/svg/as-image/squaredCircle-transparent.svg new file mode 100644 index 00000000000..32bd67b634f --- /dev/null +++ b/layout/reftests/svg/as-image/squaredCircle-transparent.svg @@ -0,0 +1,8 @@ + + + + + + +