summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.pngbin66919 -> 66896 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.pngbin67834 -> 67763 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.pngbin67658 -> 67546 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.pngbin67953 -> 67839 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.pngbin67315 -> 67273 bytes
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum1
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.pngbin0 -> 99302 bytes
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.checksum1
-rwxr-xr-xwebkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.pngbin0 -> 100553 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.pngbin22437 -> 22436 bytes
-rwxr-xr-x[-rw-r--r--]webkit/tools/layout_tests/test_expectations.txt8
17 files changed, 8 insertions, 14 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum
index e4dbc7c..0ed5fb4 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum
@@ -1 +1 @@
-fb76e7b16c4a19883ce4c7b8625c39ee \ No newline at end of file
+69fa8f2952b6c0c368175069096ac510 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
index fbe0ea3..4f50eb1 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.checksum
index 15f5675..7e8e3d5 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.checksum
@@ -1 +1 @@
-87d7ebc5c3dbca50f0813082272724a2 \ No newline at end of file
+e4fe6a414aaea370ed674a3b2211b1ff \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.png
index 7f1ec54d..e8506a5 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-10-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.checksum
index 01cd5bf..a3123d0 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.checksum
@@ -1 +1 @@
-3ed28b2c871fa3c8c68b47af3b655a5e \ No newline at end of file
+6baea4951b9086e42cfaf6df26f28499 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.png
index 171f76d..7d351ba 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-5-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.checksum
index 2db1922..6e3c40dd 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.checksum
@@ -1 +1 @@
-d9a206e8895f5b97420fa00e67a62f4e \ No newline at end of file
+e58f322360076bc55fdd2e5d00263724 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png
index 89f9013..30dc81f 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.checksum
index 7d87625..a7f0423 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.checksum
@@ -1 +1 @@
-0a7e2bb108db774d0256bd6da45892fc \ No newline at end of file
+184961dab9faaed5a760754c5a79815a \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.png
index 840358d..22c1bdc 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/line-flow-with-floats-9-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum
new file mode 100755
index 0000000..9a8e95d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum
@@ -0,0 +1 @@
+252802d652aa8ace00ed0fbee9d40794 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
new file mode 100755
index 0000000..af146af
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.checksum
new file mode 100755
index 0000000..9dce753
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.checksum
@@ -0,0 +1 @@
+9f6986a9a02fb323cd1a4c51ad75d64e \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png
new file mode 100755
index 0000000..5700fb5
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/repaint/line-flow-with-floats-6-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum
index 74959e6..8ee2def 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.checksum
@@ -1 +1 @@
-2105e4f14cea1740277f888d266b4486 \ No newline at end of file
+bb181369026a556260558ab69f9c697e \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
index df7a26b..201fcae 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/line-flow-with-floats-1-expected.png
Binary files differ
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 4f9cca0..a31eacc 100644..100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -618,10 +618,6 @@ BUG21888 : fast/history/subframe-is-visited.html = FAIL
// Implement layoutTestController.display()
BUG8630 WIN LINUX : fast/repaint/body-background-image.html = FAIL
-// TODO(michaeln): BUG29748 restore expectation to PASS after linux is rebaselined
-// BUG8630 WIN LINUX SLOW : fast/repaint/line-flow-with-floats-1.html = PASS
-BUG8630 WIN LINUX SLOW : fast/repaint/line-flow-with-floats-1.html = PASS IMAGE
-
// Relies on text metrics to pass. Rework to be meaningful for ports other than platform/mac.
BUG8630 WIN LINUX : fast/repaint/overflow-outline-repaint.html = FAIL
BUG8630 WIN LINUX : fast/backgrounds/solid-color-context-restore.html = FAIL
@@ -2773,10 +2769,6 @@ BUG29748 LINUX : fast/forms/select-change-listbox-size.html = IMAGE
BUG29748 LINUX : fast/frames/iframe-scrolling-attribute.html = IMAGE
BUG29748 LINUX : fast/frames/onlyCommentInIFrame.html = IMAGE
BUG29748 LINUX : fast/multicol/positioned-with-constrained-height.html = IMAGE
-BUG29748 LINUX : fast/repaint/line-flow-with-floats-10.html = IMAGE
-BUG29748 LINUX : fast/repaint/line-flow-with-floats-5.html = IMAGE
-BUG29748 LINUX : fast/repaint/line-flow-with-floats-6.html = IMAGE
-BUG29748 LINUX : fast/repaint/line-flow-with-floats-9.html = IMAGE
BUG29748 LINUX : fast/repaint/overflow-scroll-delete.html = IMAGE
BUG29748 LINUX : http/tests/navigation/error404-frames.html = IMAGE
BUG29748 LINUX : http/tests/navigation/post-frames.html = IMAGE