summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.pngbin0 -> 4518 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.txt11
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt3
4 files changed, 14 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.checksum
new file mode 100644
index 0000000..a866a36
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.checksum
@@ -0,0 +1 @@
+5f2483156fccbb8e01c80f84fb56633b \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.png
new file mode 100644
index 0000000..4ff4968
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.txt
new file mode 100644
index 0000000..b6cdc30
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 1896x585
+ RenderView at (0,0) size 800x585
+layer at (0,0) size 1896x585
+ RenderBlock {HTML} at (0,0) size 800x585
+ RenderBody {BODY} at (8,8) size 784x569
+ RenderInline {SPAN} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 1888x19
+ text run at (0,0) width 1888: "Side note. Both GR's have been cleaned by both myself and Miguet - Please keep our GR's clean or there will be Fire and Brimstone. The state of the GR2 today was Unacceptable with random parts that were suppose to be KGB that were not labeled, RTW, RFP and attached to a machine in awaiting parts. ."
+ text run at (1888,0) width -1104: " "
+ RenderText {#text} at (0,0) size 0x0
+ RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 32f7c5e..5d95633 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1763,7 +1763,8 @@ MAC DEBUG : LayoutTests/http/tests/xmlhttprequest/response-encoding.html = CRASH
LINUX: LayoutTests/fast/compact/001.html = CRASH PASS
// Regressions from merge 41559:41588
-LINUX WIN : LayoutTests/fast/inline/long-wrapped-line.html = FAIL
+// This one probably just needs a new baseline:
+LINUX : LayoutTests/fast/inline/long-wrapped-line.html = FAIL
WIN : chrome/fast/dom/java-applet-calls.html = FAIL
LINUX : LayoutTests/editing/execCommand/selectAll.html = FAIL
WIN : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL