Skip to content

GitLab

T
tangled
Commit 2925e1d4 authored by Xiaocheng Hu's avatar Xiaocheng Hu Committed by Commit Bot
Browse files
Options

Reland "Stop TextIterator from emit double newlines after H4~6 elements" 

The original patch caused buildbot failures because it didn't rebaseline
the newly added wpt innerText getter tests. This is fixed in this one.

Original change's description:
> Stop TextIterator from emit double newlines after H4~6 elements
>
> TextIterator currently may add two consecutive newlines after an
> H4, H5 or H6 element, while the spec of innerText doesn't have
> this case at all.
>
> This patch removes the extra newline to make TextIterator more
> spec-complicant.
>
> Note: TextIterator should eventually remove double newline emission
> also for H1~3. This patch removes it only for H4~6 to keep the
> amount of rebaselined tests small.
>
> Bug: 752672,758816
> Change-Id: I32583c194a829f52411555125e77590e36ccf838
> Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_layout_ng
> Reviewed-on: https://chromium-review.googlesource.com/661937
> Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
> Reviewed-by: Koji Ishii <kojii@chromium.org>
> Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#501297}

TBR=yosin@chromium.org,kojii@chromium.org,xiaochengh@chromium.org,simonp@opera.com

Bug: 752672,758816
Change-Id: I9f6414635d257a309eca0f7f28882c7ebdc90e94
Reviewed-on: https://chromium-review.googlesource.com/664122
Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org>
Reviewed-by: default avatarXiaocheng Hu <xiaochengh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501563}
parent 59d036e4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 144 deletions
third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2-expected.txt
View file @ 2925e1d4
Link Button Button Button
Focusable
Heading
ARIA button
ARIA disabled button
ARIA enabled button
......
third_party/WebKit/LayoutTests/accessibility/readonly-expected.txt
View file @ 2925e1d4
Link Button A B C D E F G H I J K L M
Focusable
Heading
Plain div can't be readonly
ARIA button
ARIA toggle button
......
third_party/WebKit/LayoutTests/editing/execCommand/19087-expected.txt
View file @ 2925e1d4
......@@ -2,6 +2,3 @@ This tests for a crash when indenting a particular selection that contains a blo
third_party/WebKit/LayoutTests/editing/execCommand/arguments-combinations-expected.txt
View file @ 2925e1d4
These are tests for testing the how execCommand() works with different combinations of arguments. The "InsertHorizontalRule" command was chosen arbitrarily because it was what I was working on at the time, but the results should be paralleled in the other commands as well.
CONSOLE
PASS <hr> is <hr>
PASS <hr> is <hr>
PASS <hr id="foo"> is <hr id="foo">
......
third_party/WebKit/LayoutTests/external/wpt/innerText/getter-expected.txt
View file @ 2925e1d4
This is a testharness.js-based test.
Found 213 tests; 126 PASS, 87 FAIL, 0 TIMEOUT, 0 NOTRUN.
Found 213 tests; 129 PASS, 84 FAIL, 0 TIMEOUT, 0 NOTRUN.
PASS Simplest possible test ("<div>abc")
PASS Leading whitespace removed ("<div> abc")
PASS Trailing whitespace removed ("<div>abc ")
......@@ -139,9 +139,9 @@ FAIL Blank lines around <p> even without margin ("<div>123<p style='margin:0px'>
FAIL No blank lines around <h1> ("<div>123<h1>abc</h1>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef"
FAIL No blank lines around <h2> ("<div>123<h2>abc</h2>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef"
FAIL No blank lines around <h3> ("<div>123<h3>abc</h3>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef"
FAIL No blank lines around <h4> ("<div>123<h4>abc</h4>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef"
FAIL No blank lines around <h5> ("<div>123<h5>abc</h5>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef"
FAIL No blank lines around <h6> ("<div>123<h6>abc</h6>def") assert_equals: expected "123\nabc\ndef" but got "123\nabc\n\ndef"
PASS No blank lines around <h4> ("<div>123<h4>abc</h4>def")
PASS No blank lines around <h5> ("<div>123<h5>abc</h5>def")
PASS No blank lines around <h6> ("<div>123<h6>abc</h6>def")
PASS <span> boundaries are irrelevant ("<div>123<span>abc</span>def")
PASS <span> boundaries are irrelevant ("<div>123 <span>abc</span> def")
PASS <span> boundaries are irrelevant ("<div style='width:0'>123 <span>abc</span> def")
......
third_party/WebKit/LayoutTests/fast/css/text-align-webkit-match-parent-expected.txt
View file @ 2925e1d4
......@@ -2,19 +2,15 @@ Test that verifies the behavior of text-align:-webkit-match-parent.
The test passes if all the lines containing the text "Left Align" are aligned to the left and vice-versa for "Right Align".
Cases where the outermost div is LTR.
PASS
PASS
PASS
Cases where the outermost div is RTL.
PASS
PASS
Changing text-align programmatically
PASS
check -webkit-match-parent in a nested div
PASS
PASS
......
third_party/WebKit/LayoutTests/fast/dom/inner-text-001-expected.txt
View file @ 2925e1d4
......@@ -15,9 +15,7 @@ Check collapsed margins
Collapsed margins are supposed to result in an extra line break.
First header
Second header
First list element
Second list element
This line contains an image.
......@@ -40,9 +38,7 @@ Check collapsed margins
Collapsed margins are supposed to result in an extra line break.
First header
Second header
First list element
Second list element
This line contains an image.
third_party/WebKit/LayoutTests/fast/events/drag-in-frames-expected.txt
View file @ 2925e1d4
Event log
ondragstart src
ondrag src
ondragenter left target
......
third_party/WebKit/LayoutTests/fast/invalid/nestedh3s-rapidweaver-expected.txt
View file @ 2925e1d4
......@@ -5,5 +5,4 @@ h3.nextSibling: DIV
h3.nextSibling.innerText: content
header
content
third_party/WebKit/LayoutTests/fast/table/rowspan-only-rows-height-distribution-expected.txt
View file @ 2925e1d4
Test for chromium bug : 396653. Tables with specific merge cell configuration render improperly when removing table column.
Second row is rowspan-only-cell and some empty cells present in the row because td node is deleted from the dom tree using script. So Please check that second row height should not be zero in this case.
PASS
PASS
PASS
third_party/WebKit/LayoutTests/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt
View file @ 2925e1d4
Test for chromium bug : 252120. Content of the row spanning cell is flowing out of the cell boundries.
Row spanning cell height is not set as per its content height or given height to this cells.
Test 1 - One row spanning cell present under the boundries of other row spanning cell and inner row spanning cell have lots of content.
row0 col0 rowspan=6 height=400px row0 col1
PASS
row1 col1
......@@ -29,7 +27,6 @@ PASS
row6 col0
PASS
Test 2 - One row spanning cell present under the boundries of other row spanning cell and inner row spanning cell have its own height.
row0 col0 rowspan=6 height=600px row0 col1
PASS
row1 col1
......@@ -45,7 +42,6 @@ PASS
row6 col0
PASS
Test 3 - 2 same row spanning cells with different heights.
row0 col0 rowspan=6 height=300px row0 col1 rowspan=6 height=500px
PASS
row1 col1
......@@ -61,7 +57,6 @@ PASS
row6 col0
PASS
Test 4 - some rows are common between 2 row spanning cells.
row0 col0 rowspan=6 height=400px row0 col1
PASS
row1 col1 rowspan=6 height=800px
......@@ -79,7 +74,6 @@ PASS
row7 col0
PASS
Test 5 - 2 spanning cells starts at different row index but end at same row index.
row0 col0 rowspan=6 height=400px row0 col1
PASS
row1 col1 rowspan=6 height=800px
......@@ -97,7 +91,6 @@ PASS
row7 col0
PASS
Test 6 - RowSpan and ColSpan.
row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2
PASS
row1 col0
......@@ -109,7 +102,6 @@ PASS
row4 col0
PASS
Test 7 - Mix of baseline aligned and non-baseline aligned cells.
row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom
PASS
row1 col0
......@@ -125,7 +117,6 @@ PASS
row6 col0
PASS
Test 8 - CSS Table.
row0 col0 row0 col1 row0 col2
row1 col0 row1 col1 row1 col2
row2 col0
......@@ -138,7 +129,6 @@ row8 col0
row9 col0
row10 col0
Test 9 - Table Similar to CSS table with rowspan.
row0 col0 row0 col1 row0 col2
PASS
row1 col1 row1 col2 row1 col3
......
third_party/WebKit/LayoutTests/fast/table/table-colgroup-present-after-table-row-expected.txt
View file @ 2925e1d4
Test for chromium bug : 305169. <colgroup> is ignored if seen after <tr>.
Columns width are not based on width specified in colGroup because colGroup is present after table row and we was supporting it only when colGroup is present at the start in table.
First
PASS
Col-1
......
third_party/WebKit/LayoutTests/fast/table/table-rowspan-cell-with-empty-cell-expected.txt
View file @ 2925e1d4
Test for chromium bug : 258420. Table rows are incorrectly collapsed in case of hidden cells and rowspans.
A spanning cell whose rows have only empty cell(s) shouldn't have a non-zero height.
A A1 A1.1
A2
PASS
......
third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-pedding-value-expected.txt
View file @ 2925e1d4
......@@ -4,5 +4,4 @@ For this test to PASS, it should not crash.
r0c0
r0c1
rowspan=2
third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-2-expected.txt
View file @ 2925e1d4
Test for chromium bug : 296003. Heap-buffer-overflow in void std::__final_insertion_sort.
For this test to PASS, it should not crash.
row0col0 (rowspan=3) row0col1 (rowspan=3) row0col2 (rowspan=6) row0col3 (rowspan=4) row0col4 (rowspan=16) row0col5 (rowspan=4) row0col6 (rowspan=12) row0col7 (rowspan=4) row0col8 (rowspan=12)
row1col9
row2col9 (rowspan=3) row2col10 (rowspan=8) row2col11 (rowspan=8) row2col12 (rowspan=8) row2col13 (rowspan=8)
......
third_party/WebKit/LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-expected.txt
View file @ 2925e1d4
Test for chromium bug : 276253. Crash when opening web page http://build.webkit.org/waterfall.
It should not crash.
delete stale build files
killed old processes
07:19:30 updater154325
......
third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt
View file @ 2925e1d4
Test for chromium bug : 78724. Extra logical height is not properly spread over the rows in a row-spanning cell.
Rows in rowspan should get proportional height.
Test 1 - One rowSpan cell
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -17,7 +15,6 @@ PASS
row5 col0
PASS
Test 2 - One rowSpan cell and specified table width
row0 col0 - rowspan=5 row0 col1
PASS
row1 col1
......@@ -29,7 +26,6 @@ PASS
row4 col1
PASS
Test 3 - One rowSpan cell and specified rowSpan cell height
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4
......@@ -43,7 +39,6 @@ PASS
row5 col0 row5 col1
PASS
Test 4 - One rowSpan cell and specified cells height
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4
......@@ -57,7 +52,6 @@ PASS
row5 col0 row5 col1
PASS
Test 5 - RowSpan and ColSpan.
row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2
PASS
row1 col0
......@@ -69,7 +63,6 @@ PASS
row4 col0
PASS
Test 6 - Mix of baseline aligned and non-baseline aligned cells.
row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom
PASS
row1 col0
......@@ -85,7 +78,6 @@ PASS
row6 col0
PASS
Test 7 - CSS Table.
row0 col0 row0 col1 row0 col2
row1 col0 row1 col1 row1 col2
row2 col0
......@@ -98,7 +90,6 @@ row8 col0
row9 col0
row10 col0
Test 8 - Table Similar to CSS table with rowspan.
row0 col0 row0 col1 row0 col2
PASS
row1 col1 row1 col2 row1 col3
......
third_party/WebKit/LayoutTests/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt
View file @ 2925e1d4
Test for chromium bug : 254914. Height of fixed height cell is not proper when cell's row is under row spanning cell.
Rows in rowspan should get proportional height.
Test 1 - One rowSpan cell
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -17,7 +15,6 @@ PASS
row5 col0
PASS
Test 2 - One rowSpan cell and specified table width
row0 col0 - rowspan=5 row0 col1
PASS
row1 col1
......@@ -29,7 +26,6 @@ PASS
row4 col1
PASS
Test 3 - One rowSpan cell and specified rowSpan cell height
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -43,7 +39,6 @@ PASS
row5 col0 row5 col1
PASS
Test 4 - One rowSpan cell and one cell have fixed height.
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -57,7 +52,6 @@ PASS
row5 col0 row5 col1
PASS
Test 5 - One rowSpan cell and one cell have percent height.
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -71,7 +65,6 @@ PASS
row5 col0 row5 col1
PASS
Test 6 - One rowSpan cell, one cell have percent height and another one cell have fixed height.
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -85,7 +78,6 @@ PASS
row5 col0 row5 col1
PASS
Test 7 - One rowSpan cell and two cells have percent height but total percent is less than 100.
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -99,7 +91,6 @@ PASS
row5 col0 row5 col1
PASS
Test 8 - One rowSpan cell and three cells have percent height but total percent is more than 100.
row0 col0
PASS
row1 col0 height=60% row1 col1 - rowspan=4 height=300px
......@@ -113,7 +104,6 @@ PASS
row5 col0 row5 col1
PASS
Test 9 - One rowSpan cell and specified cells height.
row0 col0
PASS
row1 col0 height=70px row1 col1 - rowspan=4 height=500px
......@@ -127,7 +117,6 @@ PASS
row5 col0 height=50px row5 col1
PASS
Test 10 - RowSpan and ColSpan.
row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2
PASS
row1 col0
......@@ -139,7 +128,6 @@ PASS
row4 col0
PASS
Test 11 - Mix of baseline aligned and non-baseline aligned cells.
row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom
PASS
row1 col0
......@@ -155,7 +143,6 @@ PASS
row6 col0
PASS
Test 12 - CSS Table.
row0 col0 row0 col1 row0 col2
row1 col0 row1 col1 row1 col2
row2 col0
......@@ -168,7 +155,6 @@ row8 col0
row9 col0
row10 col0
Test 13 - Table Similar to CSS table with rowspan.
row0 col0 row0 col1 row0 col2
PASS
row1 col1 row1 col2 row1 col3
......
third_party/WebKit/LayoutTests/fast/table/table-rowspan-table-height-and-row-precent-height-too-large-expected.txt
View file @ 2925e1d4
......@@ -2,6 +2,5 @@ Test for chromium bug : 408066.
Page is crashing on assression when table row span cell's percent height is too large.
For this test to PASS, it should not crash.
This row span cell height is too large.
third_party/WebKit/LayoutTests/fast/table/table-sections-border-spacing-expected.txt
View file @ 2925e1d4
Test for chromium bug : 29502. border-spacing is doubled between table-row-groups.
Border-spacing was adding twice, One for bottom of first section and another for top of second section. But bottom of first section and top of second section border spacing should be common.
Distance between all rows in the table should be same.
row0 head0 row0 head1
......
third_party/WebKit/LayoutTests/fast/table/table-toggle-paragraph-padding-expected.txt
View file @ 2925e1d4
Test for chromium bug : 241331. Margins on children of display:table-cell elements get stuck at highest value.
BeforeMargin of the row was not reseting back to 0 when margin of the cell's child is changed from 100px to 0.
The two blocks below should look identical.
a
......
third_party/WebKit/LayoutTests/fast/tokenizer/004-expected.txt
View file @ 2925e1d4
Variations on type attribute of script tag
These scripts should execute
no type attribute executed
empty string executed
text/javascript executed
......@@ -25,7 +24,6 @@ application/ecmascript executed
application/x-javascript executed
application/x-ecmascript executed
These scripts should not execute
one space
text/
text/vbscript
......@@ -95,7 +93,6 @@ bogus
Variations on language attribute of script tag
These scripts should execute
no language attribute executed
empty string executed
jscript executed
......@@ -113,7 +110,6 @@ JavaScript1.5 executed
JavaScript1.6 executed
JavaScript1.7 executed
These scripts should not execute
one space
vbscript
livescript1.1
......@@ -160,7 +156,6 @@ bogus
Variations on combined type and language attributes of script tag
These scripts should execute
empty string type, "javascript" language executed
empty string language, "text/javascript" type executed
"javascript" language, "text/javascript" type executed
......@@ -168,7 +163,6 @@ empty string language, "text/javascript" type executed
"livescript" language, "text/javascript" type executed
"javascript1.2" language, "text/javascript" type executed
These scripts should not execute
"javascript" language, "bogus" type
empty string type, "bogus" language
empty string language, "bogus" type
third_party/WebKit/LayoutTests/html/sections/nav-element-expected.txt
View file @ 2925e1d4
Test content
Test that nav closes p. This paragraph should be surrounded by a thin green border, instead of a thick red one. Also tests that nav lays out as a block. There should be only a single border box with width of the content area (minus margins).
Test that p does not close nav. This paragraph should have a double green border.
......@@ -15,7 +14,6 @@ Test of FormatBlock behavior. This text should have a green border.
DOM for the above (so this test can dump as text)
<p></p><nav>Test that <code>nav</code> closes <code>p</code>. This paragraph should be surrounded by a thin green border, instead of a thick red one. Also tests that nav lays out as a block. There should be only a single border box with width of the content area (minus margins).</nav>
<br>
<nav><p>Test that <code>p</code> does not close <code>nav</code>. This paragraph should have a double green border.</p></nav>
......
third_party/WebKit/LayoutTests/html/tabular_data/table_insertrow-expected.txt
View file @ 2925e1d4
HTMLTableElement's insertRow() method
The first three test whether HTMLTableElement's insertRow() method can add an implicit tbody into a table without one, to hold the inserted row.
The first tests an empty table
The second tests a table with text contents.
......@@ -9,7 +8,6 @@ The second tests a table with text contents.
The third tests a table with only a form element inside.
The next four test the method on typical cases.
The first tests a table with only a thead
The second tests a table with only a tbody
......
third_party/WebKit/LayoutTests/http/tests/loading/redirect-methods-expected.txt
View file @ 2925e1d4
......@@ -91,13 +91,9 @@ This test checks to see what HTTP method is used to fetch the final resource in
301, 302, 303, and 307 http redirects are all tested.
301 redirect
302 redirect
303 redirect
307 redirect
third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-ALLOWED-targeted-subframe-navigation-change-expected.txt
View file @ 2925e1d4
This tests that documents can navigate the location of any of it's sub-frames regardless of domain.
127.0.0.1
Perform Test
--------
......@@ -10,10 +9,8 @@ Frame: '<!--framePath //<!--frame0-->-->'
localhost
--------
Frame: 'targetFrame'
--------
localhost
PASSED: Navigation succeeded.
third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-targeted-link-navigation-expected.txt
View file @ 2925e1d4
......@@ -6,7 +6,6 @@ Frame: '<!--framePath //<!--frame0-->-->'
Frame-with-link-to-navigate
localhost
Test PASSED
Click me
......
third_party/WebKit/LayoutTests/http/tests/security/frameNavigation/xss-DENIED-top-navigation-without-user-gesture-expected.txt
View file @ 2925e1d4
CONSOLE WARNING: line 8: Frame with URL 'http://localhost:8000/security/frameNavigation/resources/iframe-that-performs-top-navigation-without-user-gesture.html' attempted to navigate its top-level window with URL 'http://127.0.0.1:8000/security/frameNavigation/xss-DENIED-top-navigation-without-user-gesture.html'. Navigating the top-level window from a cross-origin iframe will soon require that the iframe has received a user gesture. See https://www.chromestatus.com/features/5851021045661696.
localhost
PASSED: Navigation succeeded.
third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-cross-origin-iframe-with-user-gesture-allowed-expected.txt
View file @ 2925e1d4
......@@ -4,7 +4,6 @@ This tests that a cross-origin iframe with user gesture can vibrate.
127.0.0.1
--------
Frame: '<!--framePath //<!--frame0-->-->'
--------
......
third_party/WebKit/LayoutTests/http/tests/security/vibration/vibrate-in-same-origin-iframe-with-user-gesture-allowed-expected.txt
View file @ 2925e1d4
......@@ -4,7 +4,6 @@ This tests that a same-origin iframe with user gesture can vibrate.
127.0.0.1
--------
Frame: '<!--framePath //<!--frame0-->-->'
--------
......
third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt
View file @ 2925e1d4
Test for chromium bug : 249600. Extra logical height is not properly spread over the rows in a row-spanning cell.
Rows in rowspan should get proportional height.
Test 1 - Three rowSpan cells
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -58,7 +56,6 @@ PASS
row17 col0 row17 col1
PASS
Test 2 - Three rowSpan cell and specified table width
row0 col0 - rowspan=5 row0 col1
PASS
row1 col1
......@@ -117,7 +114,6 @@ PASS
row16 col0 row16 col1
PASS
Test 3 - Continuous 3 rowSpan cells
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -164,7 +160,6 @@ PASS
row13 col0 row13 col1
PASS
Test 4 - Two rowSpan cells, 2 rows in first spanning cell have percent height and 2 rows in second spanning cell have fixed height
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -214,7 +209,6 @@ PASS
row12 col0
PASS
Test 5 - Two rowSpan cells, in first spanning cell, 2 rows have percent height and 2 rows have fixed height and in second spanning cell, 1 row have fixed height, 1 row have percent height and remaining are auto.
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -257,7 +251,6 @@ PASS
row12 col0
PASS
Test 6 - RowSpan and ColSpan.
row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2
PASS
row1 col0
......@@ -269,7 +262,6 @@ PASS
row4 col0
PASS
Test 7 - Mix of baseline aligned and non-baseline aligned cells.
row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom
PASS
row1 col0
......@@ -296,7 +288,6 @@ PASS
row6 col0
PASS
Test 8 - CSS Table.
row0 col0 row0 col1 row0 col2
row1 col0 row1 col1 row1 col2
row2 col0
......@@ -309,7 +300,6 @@ row8 col0
row9 col0
row10 col0
Test 9 - Table Similar to CSS table with rowspan.
row0 col0 row0 col1 row0 col2
FAIL:
Expected 21 for height, but got 19.
......
third_party/WebKit/LayoutTests/platform/mac/fast/table/table-all-rowspans-height-distribution-in-rows-expected.txt
View file @ 2925e1d4
Test for chromium bug : 252120. Content of the row spanning cell is flowing out of the cell boundries.
Row spanning cell height is not set as per its content height or given height to this cells.
Test 1 - One row spanning cell present under the boundries of other row spanning cell and inner row spanning cell have lots of content.
row0 col0 rowspan=6 height=400px row0 col1
PASS
row1 col1
......@@ -34,7 +32,6 @@ PASS
row6 col0
PASS
Test 2 - One row spanning cell present under the boundries of other row spanning cell and inner row spanning cell have its own height.
row0 col0 rowspan=6 height=600px row0 col1
PASS
row1 col1
......@@ -55,7 +52,6 @@ PASS
row6 col0
PASS
Test 3 - 2 same row spanning cells with different heights.
row0 col0 rowspan=6 height=300px row0 col1 rowspan=6 height=500px
FAIL:
Expected 308 for height, but got 310.
......@@ -77,7 +73,6 @@ PASS
row6 col0
PASS
Test 4 - some rows are common between 2 row spanning cells.
row0 col0 rowspan=6 height=400px row0 col1
PASS
row1 col1 rowspan=6 height=800px
......@@ -100,7 +95,6 @@ PASS
row7 col0
PASS
Test 5 - 2 spanning cells starts at different row index but end at same row index.
row0 col0 rowspan=6 height=400px row0 col1
PASS
row1 col1 rowspan=6 height=800px
......@@ -123,7 +117,6 @@ PASS
row7 col0
PASS
Test 6 - RowSpan and ColSpan.
row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2
PASS
row1 col0
......@@ -135,7 +128,6 @@ PASS
row4 col0
PASS
Test 7 - Mix of baseline aligned and non-baseline aligned cells.
row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom
PASS
row1 col0
......@@ -162,7 +154,6 @@ PASS
row6 col0
PASS
Test 8 - CSS Table.
row0 col0 row0 col1 row0 col2
row1 col0 row1 col1 row1 col2
row2 col0
......@@ -175,7 +166,6 @@ row8 col0
row9 col0
row10 col0
Test 9 - Table Similar to CSS table with rowspan.
row0 col0 row0 col1 row0 col2
FAIL:
Expected 21 for height, but got 19.
......
third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-1-expected.txt
View file @ 2925e1d4
Test for chromium bug : 78724. Extra logical height is not properly spread over the rows in a row-spanning cell.
Rows in rowspan should get proportional height.
Test 1 - One rowSpan cell
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -17,7 +15,6 @@ PASS
row5 col0
PASS
Test 2 - One rowSpan cell and specified table width
row0 col0 - rowspan=5 row0 col1
PASS
row1 col1
......@@ -29,7 +26,6 @@ PASS
row4 col1
PASS
Test 3 - One rowSpan cell and specified rowSpan cell height
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4
......@@ -54,7 +50,6 @@ PASS
row5 col0 row5 col1
PASS
Test 4 - One rowSpan cell and specified cells height
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4
......@@ -74,7 +69,6 @@ PASS
row5 col0 row5 col1
PASS
Test 5 - RowSpan and ColSpan.
row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2
PASS
row1 col0
......@@ -86,7 +80,6 @@ PASS
row4 col0
PASS
Test 6 - Mix of baseline aligned and non-baseline aligned cells.
row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom
PASS
row1 col0
......@@ -113,7 +106,6 @@ PASS
row6 col0
PASS
Test 7 - CSS Table.
row0 col0 row0 col1 row0 col2
row1 col0 row1 col1 row1 col2
row2 col0
......@@ -126,7 +118,6 @@ row8 col0
row9 col0
row10 col0
Test 8 - Table Similar to CSS table with rowspan.
row0 col0 row0 col1 row0 col2
FAIL:
Expected 21 for height, but got 19.
......
third_party/WebKit/LayoutTests/platform/mac/fast/table/table-rowspan-height-distribution-in-rows-2-expected.txt
View file @ 2925e1d4
Test for chromium bug : 254914. Height of fixed height cell is not proper when cell's row is under row spanning cell.
Rows in rowspan should get proportional height.
Test 1 - One rowSpan cell
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -17,7 +15,6 @@ PASS
row5 col0
PASS
Test 2 - One rowSpan cell and specified table width
row0 col0 - rowspan=5 row0 col1
PASS
row1 col1
......@@ -29,7 +26,6 @@ PASS
row4 col1
PASS
Test 3 - One rowSpan cell and specified rowSpan cell height
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -54,7 +50,6 @@ PASS
row5 col0 row5 col1
PASS
Test 4 - One rowSpan cell and one cell have fixed height.
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -79,7 +74,6 @@ PASS
row5 col0 row5 col1
PASS
Test 5 - One rowSpan cell and one cell have percent height.
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -104,7 +98,6 @@ PASS
row5 col0 row5 col1
PASS
Test 6 - One rowSpan cell, one cell have percent height and another one cell have fixed height.
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -123,7 +116,6 @@ PASS
row5 col0 row5 col1
PASS
Test 7 - One rowSpan cell and two cells have percent height but total percent is less than 100.
row0 col0
PASS
row1 col0 row1 col1 - rowspan=4 height=300px
......@@ -158,7 +150,6 @@ Expected 142 for height, but got 143.
row5 col0 row5 col1
PASS
Test 8 - One rowSpan cell and three cells have percent height but total percent is more than 100.
row0 col0
PASS
row1 col0 height=60% row1 col1 - rowspan=4 height=300px
......@@ -178,7 +169,6 @@ PASS
row5 col0 row5 col1
PASS
Test 9 - One rowSpan cell and specified cells height.
row0 col0
PASS
row1 col0 height=70px row1 col1 - rowspan=4 height=500px
......@@ -192,7 +182,6 @@ PASS
row5 col0 height=50px row5 col1
PASS
Test 10 - RowSpan and ColSpan.
row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2
PASS
row1 col0
......@@ -204,7 +193,6 @@ PASS
row4 col0
PASS
Test 11 - Mix of baseline aligned and non-baseline aligned cells.
row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom
PASS
row1 col0
......@@ -231,7 +219,6 @@ PASS
row6 col0
PASS
Test 12 - CSS Table.
row0 col0 row0 col1 row0 col2
row1 col0 row1 col1 row1 col2
row2 col0
......@@ -244,7 +231,6 @@ row8 col0
row9 col0
row10 col0
Test 13 - Table Similar to CSS table with rowspan.
row0 col0 row0 col1 row0 col2
FAIL:
Expected 21 for height, but got 19.
......
third_party/WebKit/LayoutTests/platform/win/fast/table/table-all-rowspans-height-distribution-in-rows-except-overlapped-expected.txt
View file @ 2925e1d4
Test for chromium bug : 249600. Extra logical height is not properly spread over the rows in a row-spanning cell.
Rows in rowspan should get proportional height.
Test 1 - Three rowSpan cells
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -41,7 +39,6 @@ PASS
row17 col0 row17 col1
PASS
Test 2 - Three rowSpan cell and specified table width
row0 col0 - rowspan=5 row0 col1
PASS
row1 col1
......@@ -77,7 +74,6 @@ PASS
row16 col0 row16 col1
PASS
Test 3 - Continuous 3 rowSpan cells
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -107,7 +103,6 @@ PASS
row13 col0 row13 col1
PASS
Test 4 - Two rowSpan cells, 2 rows in first spanning cell have percent height and 2 rows in second spanning cell have fixed height
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -135,7 +130,6 @@ PASS
row12 col0
PASS
Test 5 - Two rowSpan cells, in first spanning cell, 2 rows have percent height and 2 rows have fixed height and in second spanning cell, 1 row have fixed height, 1 row have percent height and remaining are auto.
row0 col0
PASS
row1 col0 - rowspan=4 row1 col1
......@@ -163,7 +157,6 @@ PASS
row12 col0
PASS
Test 6 - RowSpan and ColSpan.
row0 col0 row0 col1 - rowspan=3 colspan=2 row0 col2
PASS
row1 col0
......@@ -175,7 +168,6 @@ PASS
row4 col0
PASS
Test 7 - Mix of baseline aligned and non-baseline aligned cells.
row0 col0 row0 col1 vertical-align=top row0 col2 vertical-align=bottom
PASS
row1 col0
......@@ -191,7 +183,6 @@ PASS
row6 col0
PASS
Test 8 - CSS Table.
row0 col0 row0 col1 row0 col2
row1 col0 row1 col1 row1 col2
row2 col0
......@@ -204,7 +195,6 @@ row8 col0
row9 col0
row10 col0
Test 9 - Table Similar to CSS table with rowspan.
row0 col0 row0 col1 row0 col2
PASS
row1 col1 row1 col2 row1 col3
......
third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp
View file @ 2925e1d4
......@@ -657,8 +657,7 @@ static bool ShouldEmitExtraNewlineForNode(Node* node) {
return true;
if (node->HasTagName(h1Tag) || node->HasTagName(h2Tag) ||
node->HasTagName(h3Tag) || node->HasTagName(h4Tag) ||
node->HasTagName(h5Tag) || node->HasTagName(h6Tag)) {
node->HasTagName(h3Tag)) {
const ComputedStyle* style = r->Style();
if (style) {
int bottom_margin = ToLayoutBox(r)->CollapsedMarginAfter().ToInt();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment