summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.pngbin0 -> 16318 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.txt32
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt1
4 files changed, 33 insertions, 1 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.checksum
new file mode 100644
index 0000000..a2ae1be
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.checksum
@@ -0,0 +1 @@
+9e509b7f4bac78029414767d235a9887 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.png
new file mode 100644
index 0000000..eaa50c2
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.txt
new file mode 100644
index 0000000..5df12e0
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/inline/dirtyLinesForInline-expected.txt
@@ -0,0 +1,32 @@
+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
+ RenderBlock {P} at (0,0) size 784x36
+ RenderText {#text} at (0,0) size 772x36
+ text run at (0,0) width 598: "To reproduce this bug outside of DumpRenderTree, mouse over the links below several times. "
+ text run at (598,0) width 174: "The bug is fixed if we don't"
+ text run at (0,18) width 37: "crash."
+ RenderBlock {DIV} at (0,52) size 784x55
+ RenderTable {TABLE} at (0,0) size 132x55
+ RenderTableSection {TBODY} at (0,0) size 132x55
+ RenderTableRow {TR} at (0,2) size 132x51
+ RenderTableCell {TD} at (2,2) size 128x51 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (1,1) size 126x49
+ RenderInline {A} at (0,0) size 98x36 [color=#0000EE]
+ RenderInline {SPAN} at (0,0) size 98x36
+ RenderText {#text} at (0,0) size 98x36
+ text run at (0,0) width 98: "this is the home"
+ text run at (0,18) width 30: "page"
+ RenderText {#text} at (30,18) size 35x18
+ text run at (30,18) width 35: "home"
+ RenderBR {BR} at (65,32) size 0x0
+ RenderInline {A} at (0,0) size 39x13 [color=#0000EE]
+ RenderText {#text} at (0,36) size 39x13
+ text run at (0,36) width 39: "about us"
+ RenderBR {BR} at (39,46) size 0x0
+layer at (11,99) size 110x13
+ RenderBlock (positioned) {SPAN} at (11,99) size 110x13
+ RenderText {#text} at (0,0) size 110x13
+ text run at (0,0) width 110: "this is the about us page"
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index e4a6c5f..e252ba7 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3146,7 +3146,6 @@ BUG24930 LINUX DEBUG : LayoutTests/editing/selection/editable-html-element.html
BUG24930 MAC DEBUG : LayoutTests/editing/selection/editable-html-element.html = FAIL PASS
// WebKit Roll 49597:49640
-BUG24963 MAC : LayoutTests/fast/inline/dirtyLinesForInline.html = FAIL
BUG24964 MAC : LayoutTests/fast/backgrounds/svg-as-background-6.html = FAIL
BUG24964 WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = FAIL
BUG24965 LINUX RELEASE : LayoutTests/fast/forms/preserveFormDuringResidualStyle.html = CRASH PASS