summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.pngbin0 -> 6199 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.txt13
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.pngbin0 -> 3893 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.txt13
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt1
7 files changed, 28 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.checksum
new file mode 100644
index 0000000..9a97e26
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.checksum
@@ -0,0 +1 @@
+e68bdc5a6a61ce489b2705fd8c1d2807 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.png
new file mode 100644
index 0000000..60a968a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.txt
new file mode 100644
index 0000000..4863ace
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.txt
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderText {#text} at (0,0) size 590x19
+ text run at (0,0) width 590: "There should be a green square, followed by 6 squares of shades of green from white to full green."
+ RenderBR {BR} at (590,15) size 0x0
+ RenderHTMLCanvas {CANVAS} at (0,20) size 700x100
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.checksum
new file mode 100644
index 0000000..8818fd2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.checksum
@@ -0,0 +1 @@
+faf8e3dae6a8df93fba1a833b52d321b \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.png
new file mode 100644
index 0000000..f2eaa44
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.txt
new file mode 100644
index 0000000..4863ace
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/canvas/drawImage-with-globalAlpha-expected.txt
@@ -0,0 +1,13 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderText {#text} at (0,0) size 590x19
+ text run at (0,0) width 590: "There should be a green square, followed by 6 squares of shades of green from white to full green."
+ RenderBR {BR} at (590,15) size 0x0
+ RenderHTMLCanvas {CANVAS} at (0,20) size 700x100
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index da6c299..fe6c575 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2695,7 +2695,6 @@ BUG13314 LINUX : LayoutTests/platform/mac/accessibility/accesskey.html = CRASH F
// WebKit 44438:44544
BUG13721 WIN LINUX : LayoutTests/fast/canvas/canvas-transforms-during-path.html = FAIL
-BUG13721 WIN LINUX : LayoutTests/fast/canvas/drawImage-with-globalAlpha.html = FAIL
BUG13721 WIN LINUX : LayoutTests/fast/canvas/quadraticCurveTo.xml = FAIL
BUG13721 LINUX : LayoutTests/fast/dynamic/positioned-movement-with-positioned-children.html = FAIL