summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsenorblanco@chromium.org <senorblanco@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2013-06-15 15:11:42 +0000
committersenorblanco@chromium.org <senorblanco@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538>2013-06-15 15:11:42 +0000
commit0de2a03d16834d64da68a222602a174da18f71e5 (patch)
treeb33f22ececd13ad456f63abc6f2a0476968e9de1
parent389d3658d645b29fa0ab38ff71730cc862f39d23 (diff)
downloadchromium_src-0de2a03d16834d64da68a222602a174da18f71e5.zip
chromium_src-0de2a03d16834d64da68a222602a174da18f71e5.tar.gz
chromium_src-0de2a03d16834d64da68a222602a174da18f71e5.tar.bz2
Deflakify 3 fast/canvas tests, and rebaseline.
BUG=224317 TBR=ojan@chromium.org Review URL: https://codereview.chromium.org/16862005 git-svn-id: svn://svn.chromium.org/blink/trunk@152496 bbb929c8-8fbe-4397-9dbb-9b2b20218538
-rw-r--r--third_party/WebKit/LayoutTests/TestExpectations7
-rw-r--r--third_party/WebKit/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt6
-rw-r--r--third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-shadow-expected.txt6
-rw-r--r--third_party/WebKit/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow-expected.txt6
-rw-r--r--third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js4
-rw-r--r--third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-drawImage-shadow.js4
-rw-r--r--third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-scale-drawImage-shadow.js4
7 files changed, 21 insertions, 16 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index ec2171b..0c33d84 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1176,9 +1176,6 @@ webkit.org/b/108876 [ Linux Win ] media/track/track-cues-enter-exit.html [ Slow
crbug.com/239549 inspector-protocol/heap-profiler/heap-snapshot-with-detached-dom-tree.html [ Failure Pass ]
-webkit.org/b/109312 fast/canvas/canvas-drawImage-shadow.html [ Failure Pass ]
-webkit.org/b/109312 virtual/gpu/fast/canvas/canvas-drawImage-shadow.html [ Failure Pass ]
-
webkit.org/b/110247 [ Debug ] fast/workers/storage/interrupt-database.html [ Crash Pass Slow ]
# This test is quite large, and can time out on win debug builds.
@@ -1301,11 +1298,7 @@ crbug.com/227397 svg/animations/animateMotion-additive-1.svg [ ImageOnlyFailure
# These tests need a rebasline after crbug.com/224317
# Note, after the rebaseline need to uncomment another more-specific instance of each of these.
crbug.com/224317 virtual/softwarecompositing/tiling/huge-layer-img.html [ Slow Failure Pass ]
-crbug.com/224317 virtual/gpu/fast/canvas/canvas-createPattern-fillRect-shadow.html [ Failure Pass ]
crbug.com/224317 fast/forms/basic-buttons.html [ Crash Failure Pass ]
-crbug.com/224317 fast/canvas/canvas-scale-drawImage-shadow.html [ Failure Pass ]
-crbug.com/224317 virtual/gpu/fast/canvas/canvas-scale-drawImage-shadow.html [ Failure Pass ]
-crbug.com/224317 fast/canvas/canvas-createPattern-fillRect-shadow.html [ Failure Pass ]
crbug.com/224317 http/tests/security/canvas-remote-read-data-url-svg-image.html [ Failure Pass ]
crbug.com/234758 [ Win Debug ] tables/mozilla/other/test3.html [ Crash Pass ]
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt b/third_party/WebKit/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt
index 7d68d89..d407bf8f 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-createPattern-fillRect-shadow-expected.txt
@@ -3,9 +3,6 @@ Ensure correct behavior of canvas with createPattern + fillRect with shadow.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS successfullyParsed is true
-
-TEST COMPLETE
PASS d[0] is 255
PASS d[1] is 0
PASS d[2] is 0
@@ -54,4 +51,7 @@ PASS d[0] is 255
PASS d[1] is 0
PASS d[2] is 0
PASS d[3] is around 29
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-shadow-expected.txt b/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-shadow-expected.txt
index da996b3..702162b 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-drawImage-shadow-expected.txt
@@ -3,9 +3,6 @@ Ensure correct behavior of canvas with image shadow. A square with a cut-out top
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS successfullyParsed is true
-
-TEST COMPLETE
PASS d[0] is 0
PASS d[1] is 0
PASS d[2] is 0
@@ -57,4 +54,7 @@ PASS d[0] is 0
PASS d[1] is 0
PASS d[2] is 0
PASS d[3] is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow-expected.txt b/third_party/WebKit/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow-expected.txt
index 3da0681..ad99cd8 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/canvas/canvas-scale-drawImage-shadow-expected.txt
@@ -3,9 +3,6 @@ Ensure correct behavior of canvas with drawImage+shadow after scaling. A blue an
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS successfullyParsed is true
-
-TEST COMPLETE
PASS d[0] is 255
PASS d[1] is 0
PASS d[2] is 0
@@ -54,4 +51,7 @@ PASS d[0] is 255
PASS d[1] is 0
PASS d[2] is 0
PASS d[3] is around 24
+PASS successfullyParsed is true
+
+TEST COMPLETE
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js b/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js
index 6c0fd7c..dedbd1e 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js
+++ b/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-createPattern-fillRect-shadow.js
@@ -161,4 +161,8 @@ function checkPixels() {
shouldBe('d[1]', '0');
shouldBe('d[2]', '0');
shouldBeAround('d[3]', '29');
+
+ finishJSTest();
}
+
+window.jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-drawImage-shadow.js b/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-drawImage-shadow.js
index 74ad0c1..ebeb11f 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-drawImage-shadow.js
+++ b/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-drawImage-shadow.js
@@ -159,4 +159,8 @@ function checkPixels() {
shouldBe('d[1]', '0');
shouldBe('d[2]', '0');
shouldBe('d[3]', '0');
+
+ finishJSTest();
}
+
+window.jsTestIsAsync = true;
diff --git a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-scale-drawImage-shadow.js b/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-scale-drawImage-shadow.js
index 021fb2d9..9491416 100644
--- a/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-scale-drawImage-shadow.js
+++ b/third_party/WebKit/LayoutTests/fast/canvas/script-tests/canvas-scale-drawImage-shadow.js
@@ -150,4 +150,8 @@ function checkPixels() {
shouldBe('d[1]', '0');
shouldBe('d[2]', '0');
shouldBeAround('d[3]', '24');
+
+ finishJSTest();
}
+
+window.jsTestIsAsync = true;