Skip to content

GitLab

T
tangled
Commit ccde8ca3 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot
Browse files
Options

[LayoutNG] Fix text debug rectangle dump for vertical-rl. 

Remove NG special code from LayoutText::DebugRect() and have it call
FirstRunOrigin() instead of FirstRunX() and FirstRunY(). Remove those two
methods.

Also update WriteTextFragment(), so that the coordinates it outputs match
those from DebugRect().

Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: I10947db5a031580095633eb690711720736c99d1
Reviewed-on: https://chromium-review.googlesource.com/c/1264639
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Reviewed-by: default avatarKoji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597232}
parent ec708e3c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 468 deletions
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/compositing/squashing/vertical-writing-mode-squashed-expected.txt deleted 100644 → 0
View file @ ec708e3c
layer at (0,0) size 800x600
LayoutView at (0,0) size 800x600
layer at (0,0) size 800x416
LayoutNGBlockFlow {HTML} at (0,0) size 800x416
LayoutNGBlockFlow {BODY} at (8,8) size 784x400
layer at (8,8) size 400x400 clip at (8,8) size 400x385 scrollX 9640.00 scrollWidth 10040
LayoutNGBlockFlow {DIV} at (0,0) size 400x400
LayoutNGBlockFlow {DIV} at (40,0) size 10000x200 [bgcolor=#FFFF00]
layer at (368,8) size 40x385
LayoutNGBlockFlow (relative positioned) {DIV} at (0,0) size 40x385
LayoutNGBlockFlow (anonymous) at (0,0) size 20x385
LayoutText {#text} at (1,0) size 19x63
text run at (1,0) width 63: "Some text"
LayoutNGBlockFlow {DIV} at (20,0) size 20x385
LayoutText {#text} at (0,0) size 0x0
layer at (368,8) size 19x262
LayoutInline (relative positioned) {A} at (0,0) size 19x262
LayoutText {#text} at (1,0) size 19x262
text run at (1,0) width 262: "This text should not overlap the other text"
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/fast/backgrounds/border-radius-split-background-expected.txt
View file @ ccde8ca3
...@@ -18,13 +18,13 @@ layer at (0,0) size 800x600 ...@@ -18,13 +18,13 @@ layer at (0,0) size 800x600
text run at (179,394) width 4: " " text run at (179,394) width 4: " "
LayoutNGBlockFlow {DIV} at (183,230) size 452x179 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (183,230) size 452x179 [border: (1px solid #000000)]
LayoutInline {SPAN} at (0,0) size 418x177 [bgcolor=#808080] [border: (2px solid #000000)] LayoutInline {SPAN} at (0,0) size 418x177 [bgcolor=#808080] [border: (2px solid #000000)]
LayoutText {#text} at (319,3) size 114x50 LayoutText {#text} at (19,3) size 114x50
text run at (319,3) width 50: " " text run at (19,3) width 50: " "
LayoutBR {BR} at (319,53) size 114x0 LayoutBR {BR} at (19,53) size 114x0
LayoutText {#text} at (169,1) size 114x125 LayoutText {#text} at (169,1) size 114x125
text run at (169,1) width 125: " " text run at (169,1) width 125: " "
LayoutBR {BR} at (169,126) size 114x0 LayoutBR {BR} at (169,126) size 114x0
LayoutText {#text} at (19,1) size 114x175 LayoutText {#text} at (319,1) size 114x175
text run at (19,1) width 175: " " text run at (319,1) width 175: " "
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/fast/backgrounds/border-radius-split-background-image-expected.txt
View file @ ccde8ca3
...@@ -18,13 +18,13 @@ layer at (0,0) size 800x600 ...@@ -18,13 +18,13 @@ layer at (0,0) size 800x600
text run at (179,394) width 4: " " text run at (179,394) width 4: " "
LayoutNGBlockFlow {DIV} at (183,230) size 452x179 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (183,230) size 452x179 [border: (1px solid #000000)]
LayoutInline {SPAN} at (0,0) size 418x177 [bgcolor=#C0C0C0] [border: (2px solid #000000)] LayoutInline {SPAN} at (0,0) size 418x177 [bgcolor=#C0C0C0] [border: (2px solid #000000)]
LayoutText {#text} at (319,3) size 114x50 LayoutText {#text} at (19,3) size 114x50
text run at (319,3) width 50: " " text run at (19,3) width 50: " "
LayoutBR {BR} at (319,53) size 114x0 LayoutBR {BR} at (19,53) size 114x0
LayoutText {#text} at (169,1) size 114x125 LayoutText {#text} at (169,1) size 114x125
text run at (169,1) width 125: " " text run at (169,1) width 125: " "
LayoutBR {BR} at (169,126) size 114x0 LayoutBR {BR} at (169,126) size 114x0
LayoutText {#text} at (19,1) size 114x175 LayoutText {#text} at (319,1) size 114x175
text run at (19,1) width 175: " " text run at (319,1) width 175: " "
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.txt
View file @ ccde8ca3
...@@ -29,77 +29,77 @@ layer at (0,0) size 785x2982 backgroundClip at (0,0) size 785x600 clip at (0,0) ...@@ -29,77 +29,77 @@ layer at (0,0) size 785x2982 backgroundClip at (0,0) size 785x600 clip at (0,0)
text run at (0,0) width 507: "Right-To-Left containing replaced content blocking the ellipsis" text run at (0,0) width 507: "Right-To-Left containing replaced content blocking the ellipsis"
layer at (8,50) size 22x310 clip at (9,51) size 20x308 scrollHeight 718 layer at (8,50) size 22x310 clip at (9,51) size 20x308 scrollHeight 718
LayoutNGBlockFlow {DIV} at (0,41.72) size 22x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,41.72) size 22x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x303 LayoutText {#text} at (1,1) size 19x303
text run at (2,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (2,288) width 16: "\x{2026}" text run at (1,288) width 16: "\x{2026}"
layer at (8,421) size 82x310 backgroundClip at (8,421) size 82x179 clip at (9,422) size 80x178 scrollHeight 718 layer at (8,421) size 82x310 backgroundClip at (8,421) size 82x179 clip at (9,422) size 80x178 scrollHeight 718
LayoutNGBlockFlow {DIV} at (0,413.44) size 82x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,413.44) size 82x310 [border: (1px solid #000000)]
LayoutText {#text} at (62,1) size 19x303 LayoutText {#text} at (1,1) size 19x303
text run at (62,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (62,288) width 16: "\x{2026}" text run at (1,288) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (42,1) size 19x306 LayoutText {#text} at (21,1) size 19x306
text run at (42,1) width 290: "orem ipsum dolor sit amet, consectetur adipisc" text run at (21,1) width 290: "orem ipsum dolor sit amet, consectetur adipisc"
text run at (42,291) width 16: "\x{2026}" text run at (21,291) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (22,1) size 19x302 LayoutText {#text} at (41,1) size 19x302
text run at (22,1) width 286: "rem ipsum dolor sit amet, consectetur adipisci" text run at (41,1) width 286: "rem ipsum dolor sit amet, consectetur adipisci"
text run at (22,287) width 16: "\x{2026}" text run at (41,287) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (2,1) size 19x305 LayoutText {#text} at (61,1) size 19x305
text run at (2,1) width 289: "em ipsum dolor sit amet, consectetur adipiscin" text run at (61,1) width 289: "em ipsum dolor sit amet, consectetur adipiscin"
text run at (2,290) width 16: "\x{2026}" text run at (61,290) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
layer at (8,793) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 747 layer at (8,793) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 747
LayoutNGBlockFlow {DIV} at (0,785.16) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,785.16) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x181 LayoutText {#text} at (11,1) size 19x181
text run at (2,1) width 181: "Lorem ipsum dolor sit amet, " text run at (11,1) width 181: "Lorem ipsum dolor sit amet, "
LayoutImage {IMG} at (1,182) size 25x25 LayoutImage {IMG} at (1,182) size 25x25
LayoutText {#text} at (2,207) size 19x102 LayoutText {#text} at (11,207) size 19x102
text run at (2,207) width 86: " consectetur a" text run at (11,207) width 86: " consectetur a"
text run at (2,293) width 16: "\x{2026}" text run at (11,293) width 16: "\x{2026}"
layer at (8,1165) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 743 layer at (8,1165) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 743
LayoutNGBlockFlow {DIV} at (0,1156.88) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1156.88) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x287 LayoutText {#text} at (11,1) size 19x287
text run at (2,1) width 271: "Lorem ipsum dolor sit amet, consectetur ad" text run at (11,1) width 271: "Lorem ipsum dolor sit amet, consectetur ad"
text run at (2,272) width 16: "\x{2026}" text run at (11,272) width 16: "\x{2026}"
LayoutImage {IMG} at (0,0) size 25x25 LayoutImage {IMG} at (0,0) size 25x25
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
layer at (8,1537) size 22x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719 layer at (8,1537) size 22x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719
LayoutNGBlockFlow {DIV} at (0,1528.59) size 22x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1528.59) size 22x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,22) size 19x303 LayoutText {#text} at (1,22) size 19x303
text run at (2,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (2,6) width 16: "\x{2026}" text run at (1,6) width 16: "\x{2026}"
layer at (8,1908) size 82x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719 layer at (8,1908) size 82x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719
LayoutNGBlockFlow {DIV} at (0,1900.31) size 82x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1900.31) size 82x310 [border: (1px solid #000000)]
LayoutText {#text} at (62,22) size 19x303 LayoutText {#text} at (1,22) size 19x303
text run at (62,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (62,6) width 16: "\x{2026}" text run at (1,6) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (42,19) size 19x306 LayoutText {#text} at (21,19) size 19x306
text run at (42,19) width 290: "orem ipsum dolor sit amet, consectetur adipisc" text run at (21,19) width 290: "orem ipsum dolor sit amet, consectetur adipisc"
text run at (42,3) width 16: "\x{2026}" text run at (21,3) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (22,23) size 19x302 LayoutText {#text} at (41,23) size 19x302
text run at (22,23) width 286: "rem ipsum dolor sit amet, consectetur adipisci" text run at (41,23) width 286: "rem ipsum dolor sit amet, consectetur adipisci"
text run at (22,7) width 16: "\x{2026}" text run at (41,7) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (2,20) size 19x305 LayoutText {#text} at (61,20) size 19x305
text run at (2,20) width 289: "em ipsum dolor sit amet, consectetur adipiscin" text run at (61,20) width 289: "em ipsum dolor sit amet, consectetur adipiscin"
text run at (2,4) width 16: "\x{2026}" text run at (61,4) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
layer at (8,2280) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 440.00 scrollHeight 748 layer at (8,2280) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 440.00 scrollHeight 748
LayoutNGBlockFlow {DIV} at (0,2272.03) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,2272.03) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,128) size 19x181 LayoutText {#text} at (11,128) size 19x181
text run at (2,128) width 181: "Lorem ipsum dolor sit amet, " text run at (11,128) width 181: "Lorem ipsum dolor sit amet, "
LayoutImage {IMG} at (1,103) size 25x25 LayoutImage {IMG} at (1,103) size 25x25
LayoutText {#text} at (2,17) size 19x102 LayoutText {#text} at (11,17) size 19x102
text run at (2,17) width 86: " consectetur a" text run at (11,17) width 86: " consectetur a"
text run at (2,1) width 16: "\x{2026}" text run at (11,1) width 16: "\x{2026}"
layer at (8,2652) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 436.00 scrollHeight 744 layer at (8,2652) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 436.00 scrollHeight 744
LayoutNGBlockFlow {DIV} at (0,2643.75) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,2643.75) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,38) size 19x287 LayoutText {#text} at (11,38) size 19x287
text run at (2,38) width 271: "Lorem ipsum dolor sit amet, consectetur ad" text run at (11,38) width 271: "Lorem ipsum dolor sit amet, consectetur ad"
text run at (2,22) width 16: "\x{2026}" text run at (11,22) width 16: "\x{2026}"
LayoutImage {IMG} at (0,0) size 25x25 LayoutImage {IMG} at (0,0) size 25x25
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/fast/css/vertical-text-overflow-ellipsis-text-align-justify-expected.txt
View file @ ccde8ca3
...@@ -29,77 +29,77 @@ layer at (0,0) size 785x2982 backgroundClip at (0,0) size 785x600 clip at (0,0) ...@@ -29,77 +29,77 @@ layer at (0,0) size 785x2982 backgroundClip at (0,0) size 785x600 clip at (0,0)
text run at (0,0) width 507: "Right-To-Left containing replaced content blocking the ellipsis" text run at (0,0) width 507: "Right-To-Left containing replaced content blocking the ellipsis"
layer at (8,50) size 22x310 clip at (9,51) size 20x308 scrollHeight 718 layer at (8,50) size 22x310 clip at (9,51) size 20x308 scrollHeight 718
LayoutNGBlockFlow {DIV} at (0,41.72) size 22x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,41.72) size 22x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x303 LayoutText {#text} at (1,1) size 19x303
text run at (2,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (2,288) width 16: "\x{2026}" text run at (1,288) width 16: "\x{2026}"
layer at (8,421) size 82x310 backgroundClip at (8,421) size 82x179 clip at (9,422) size 80x178 scrollHeight 718 layer at (8,421) size 82x310 backgroundClip at (8,421) size 82x179 clip at (9,422) size 80x178 scrollHeight 718
LayoutNGBlockFlow {DIV} at (0,413.44) size 82x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,413.44) size 82x310 [border: (1px solid #000000)]
LayoutText {#text} at (62,1) size 19x303 LayoutText {#text} at (1,1) size 19x303
text run at (62,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (62,288) width 16: "\x{2026}" text run at (1,288) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (42,1) size 19x306 LayoutText {#text} at (21,1) size 19x306
text run at (42,1) width 290: "orem ipsum dolor sit amet, consectetur adipisc" text run at (21,1) width 290: "orem ipsum dolor sit amet, consectetur adipisc"
text run at (42,291) width 16: "\x{2026}" text run at (21,291) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (22,1) size 19x302 LayoutText {#text} at (41,1) size 19x302
text run at (22,1) width 286: "rem ipsum dolor sit amet, consectetur adipisci" text run at (41,1) width 286: "rem ipsum dolor sit amet, consectetur adipisci"
text run at (22,287) width 16: "\x{2026}" text run at (41,287) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (2,1) size 19x305 LayoutText {#text} at (61,1) size 19x305
text run at (2,1) width 289: "em ipsum dolor sit amet, consectetur adipiscin" text run at (61,1) width 289: "em ipsum dolor sit amet, consectetur adipiscin"
text run at (2,290) width 16: "\x{2026}" text run at (61,290) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
layer at (8,793) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 747 layer at (8,793) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 747
LayoutNGBlockFlow {DIV} at (0,785.16) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,785.16) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x181 LayoutText {#text} at (11,1) size 19x181
text run at (2,1) width 181: "Lorem ipsum dolor sit amet, " text run at (11,1) width 181: "Lorem ipsum dolor sit amet, "
LayoutImage {IMG} at (1,182) size 25x25 LayoutImage {IMG} at (1,182) size 25x25
LayoutText {#text} at (2,207) size 19x102 LayoutText {#text} at (11,207) size 19x102
text run at (2,207) width 86: " consectetur a" text run at (11,207) width 86: " consectetur a"
text run at (2,293) width 16: "\x{2026}" text run at (11,293) width 16: "\x{2026}"
layer at (8,1165) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 743 layer at (8,1165) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 743
LayoutNGBlockFlow {DIV} at (0,1156.88) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1156.88) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x287 LayoutText {#text} at (11,1) size 19x287
text run at (2,1) width 271: "Lorem ipsum dolor sit amet, consectetur ad" text run at (11,1) width 271: "Lorem ipsum dolor sit amet, consectetur ad"
text run at (2,272) width 16: "\x{2026}" text run at (11,272) width 16: "\x{2026}"
LayoutImage {IMG} at (0,0) size 25x25 LayoutImage {IMG} at (0,0) size 25x25
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
layer at (8,1537) size 22x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719 layer at (8,1537) size 22x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719
LayoutNGBlockFlow {DIV} at (0,1528.59) size 22x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1528.59) size 22x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,22) size 19x303 LayoutText {#text} at (1,22) size 19x303
text run at (2,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (2,6) width 16: "\x{2026}" text run at (1,6) width 16: "\x{2026}"
layer at (8,1908) size 82x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719 layer at (8,1908) size 82x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719
LayoutNGBlockFlow {DIV} at (0,1900.31) size 82x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1900.31) size 82x310 [border: (1px solid #000000)]
LayoutText {#text} at (62,22) size 19x303 LayoutText {#text} at (1,22) size 19x303
text run at (62,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (62,6) width 16: "\x{2026}" text run at (1,6) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (42,19) size 19x306 LayoutText {#text} at (21,19) size 19x306
text run at (42,19) width 290: "orem ipsum dolor sit amet, consectetur adipisc" text run at (21,19) width 290: "orem ipsum dolor sit amet, consectetur adipisc"
text run at (42,3) width 16: "\x{2026}" text run at (21,3) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (22,23) size 19x302 LayoutText {#text} at (41,23) size 19x302
text run at (22,23) width 286: "rem ipsum dolor sit amet, consectetur adipisci" text run at (41,23) width 286: "rem ipsum dolor sit amet, consectetur adipisci"
text run at (22,7) width 16: "\x{2026}" text run at (41,7) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (2,20) size 19x305 LayoutText {#text} at (61,20) size 19x305
text run at (2,20) width 289: "em ipsum dolor sit amet, consectetur adipiscin" text run at (61,20) width 289: "em ipsum dolor sit amet, consectetur adipiscin"
text run at (2,4) width 16: "\x{2026}" text run at (61,4) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
layer at (8,2280) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 440.00 scrollHeight 748 layer at (8,2280) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 440.00 scrollHeight 748
LayoutNGBlockFlow {DIV} at (0,2272.03) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,2272.03) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,128) size 19x181 LayoutText {#text} at (11,128) size 19x181
text run at (2,128) width 181: "Lorem ipsum dolor sit amet, " text run at (11,128) width 181: "Lorem ipsum dolor sit amet, "
LayoutImage {IMG} at (1,103) size 25x25 LayoutImage {IMG} at (1,103) size 25x25
LayoutText {#text} at (2,17) size 19x102 LayoutText {#text} at (11,17) size 19x102
text run at (2,17) width 86: " consectetur a" text run at (11,17) width 86: " consectetur a"
text run at (2,1) width 16: "\x{2026}" text run at (11,1) width 16: "\x{2026}"
layer at (8,2652) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 436.00 scrollHeight 744 layer at (8,2652) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 436.00 scrollHeight 744
LayoutNGBlockFlow {DIV} at (0,2643.75) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,2643.75) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,38) size 19x287 LayoutText {#text} at (11,38) size 19x287
text run at (2,38) width 271: "Lorem ipsum dolor sit amet, consectetur ad" text run at (11,38) width 271: "Lorem ipsum dolor sit amet, consectetur ad"
text run at (2,22) width 16: "\x{2026}" text run at (11,22) width 16: "\x{2026}"
LayoutImage {IMG} at (0,0) size 25x25 LayoutImage {IMG} at (0,0) size 25x25
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/fast/css/vertical-text-overflow-ellipsis-text-align-left-expected.txt
View file @ ccde8ca3
...@@ -29,77 +29,77 @@ layer at (0,0) size 785x2982 backgroundClip at (0,0) size 785x600 clip at (0,0) ...@@ -29,77 +29,77 @@ layer at (0,0) size 785x2982 backgroundClip at (0,0) size 785x600 clip at (0,0)
text run at (0,0) width 507: "Right-To-Left containing replaced content blocking the ellipsis" text run at (0,0) width 507: "Right-To-Left containing replaced content blocking the ellipsis"
layer at (8,50) size 22x310 clip at (9,51) size 20x308 scrollHeight 718 layer at (8,50) size 22x310 clip at (9,51) size 20x308 scrollHeight 718
LayoutNGBlockFlow {DIV} at (0,41.72) size 22x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,41.72) size 22x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x303 LayoutText {#text} at (1,1) size 19x303
text run at (2,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (2,288) width 16: "\x{2026}" text run at (1,288) width 16: "\x{2026}"
layer at (8,421) size 82x310 backgroundClip at (8,421) size 82x179 clip at (9,422) size 80x178 scrollHeight 718 layer at (8,421) size 82x310 backgroundClip at (8,421) size 82x179 clip at (9,422) size 80x178 scrollHeight 718
LayoutNGBlockFlow {DIV} at (0,413.44) size 82x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,413.44) size 82x310 [border: (1px solid #000000)]
LayoutText {#text} at (62,1) size 19x303 LayoutText {#text} at (1,1) size 19x303
text run at (62,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (62,288) width 16: "\x{2026}" text run at (1,288) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (42,1) size 19x306 LayoutText {#text} at (21,1) size 19x306
text run at (42,1) width 290: "orem ipsum dolor sit amet, consectetur adipisc" text run at (21,1) width 290: "orem ipsum dolor sit amet, consectetur adipisc"
text run at (42,291) width 16: "\x{2026}" text run at (21,291) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (22,1) size 19x302 LayoutText {#text} at (41,1) size 19x302
text run at (22,1) width 286: "rem ipsum dolor sit amet, consectetur adipisci" text run at (41,1) width 286: "rem ipsum dolor sit amet, consectetur adipisci"
text run at (22,287) width 16: "\x{2026}" text run at (41,287) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (2,1) size 19x305 LayoutText {#text} at (61,1) size 19x305
text run at (2,1) width 289: "em ipsum dolor sit amet, consectetur adipiscin" text run at (61,1) width 289: "em ipsum dolor sit amet, consectetur adipiscin"
text run at (2,290) width 16: "\x{2026}" text run at (61,290) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
layer at (8,793) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 747 layer at (8,793) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 747
LayoutNGBlockFlow {DIV} at (0,785.16) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,785.16) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x181 LayoutText {#text} at (11,1) size 19x181
text run at (2,1) width 181: "Lorem ipsum dolor sit amet, " text run at (11,1) width 181: "Lorem ipsum dolor sit amet, "
LayoutImage {IMG} at (1,182) size 25x25 LayoutImage {IMG} at (1,182) size 25x25
LayoutText {#text} at (2,207) size 19x102 LayoutText {#text} at (11,207) size 19x102
text run at (2,207) width 86: " consectetur a" text run at (11,207) width 86: " consectetur a"
text run at (2,293) width 16: "\x{2026}" text run at (11,293) width 16: "\x{2026}"
layer at (8,1165) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 743 layer at (8,1165) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 743
LayoutNGBlockFlow {DIV} at (0,1156.88) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1156.88) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x287 LayoutText {#text} at (11,1) size 19x287
text run at (2,1) width 271: "Lorem ipsum dolor sit amet, consectetur ad" text run at (11,1) width 271: "Lorem ipsum dolor sit amet, consectetur ad"
text run at (2,272) width 16: "\x{2026}" text run at (11,272) width 16: "\x{2026}"
LayoutImage {IMG} at (0,0) size 25x25 LayoutImage {IMG} at (0,0) size 25x25
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
layer at (8,1537) size 22x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719 layer at (8,1537) size 22x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719
LayoutNGBlockFlow {DIV} at (0,1528.59) size 22x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1528.59) size 22x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,22) size 19x303 LayoutText {#text} at (1,22) size 19x303
text run at (2,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (2,6) width 16: "\x{2026}" text run at (1,6) width 16: "\x{2026}"
layer at (8,1908) size 82x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719 layer at (8,1908) size 82x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719
LayoutNGBlockFlow {DIV} at (0,1900.31) size 82x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1900.31) size 82x310 [border: (1px solid #000000)]
LayoutText {#text} at (62,22) size 19x303 LayoutText {#text} at (1,22) size 19x303
text run at (62,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (62,6) width 16: "\x{2026}" text run at (1,6) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (42,19) size 19x306 LayoutText {#text} at (21,19) size 19x306
text run at (42,19) width 290: "orem ipsum dolor sit amet, consectetur adipisc" text run at (21,19) width 290: "orem ipsum dolor sit amet, consectetur adipisc"
text run at (42,3) width 16: "\x{2026}" text run at (21,3) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (22,23) size 19x302 LayoutText {#text} at (41,23) size 19x302
text run at (22,23) width 286: "rem ipsum dolor sit amet, consectetur adipisci" text run at (41,23) width 286: "rem ipsum dolor sit amet, consectetur adipisci"
text run at (22,7) width 16: "\x{2026}" text run at (41,7) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (2,20) size 19x305 LayoutText {#text} at (61,20) size 19x305
text run at (2,20) width 289: "em ipsum dolor sit amet, consectetur adipiscin" text run at (61,20) width 289: "em ipsum dolor sit amet, consectetur adipiscin"
text run at (2,4) width 16: "\x{2026}" text run at (61,4) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
layer at (8,2280) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 440.00 scrollHeight 748 layer at (8,2280) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 440.00 scrollHeight 748
LayoutNGBlockFlow {DIV} at (0,2272.03) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,2272.03) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,128) size 19x181 LayoutText {#text} at (11,128) size 19x181
text run at (2,128) width 181: "Lorem ipsum dolor sit amet, " text run at (11,128) width 181: "Lorem ipsum dolor sit amet, "
LayoutImage {IMG} at (1,103) size 25x25 LayoutImage {IMG} at (1,103) size 25x25
LayoutText {#text} at (2,17) size 19x102 LayoutText {#text} at (11,17) size 19x102
text run at (2,17) width 86: " consectetur a" text run at (11,17) width 86: " consectetur a"
text run at (2,1) width 16: "\x{2026}" text run at (11,1) width 16: "\x{2026}"
layer at (8,2652) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 436.00 scrollHeight 744 layer at (8,2652) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 436.00 scrollHeight 744
LayoutNGBlockFlow {DIV} at (0,2643.75) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,2643.75) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,38) size 19x287 LayoutText {#text} at (11,38) size 19x287
text run at (2,38) width 271: "Lorem ipsum dolor sit amet, consectetur ad" text run at (11,38) width 271: "Lorem ipsum dolor sit amet, consectetur ad"
text run at (2,22) width 16: "\x{2026}" text run at (11,22) width 16: "\x{2026}"
LayoutImage {IMG} at (0,0) size 25x25 LayoutImage {IMG} at (0,0) size 25x25
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.txt
View file @ ccde8ca3
...@@ -29,77 +29,77 @@ layer at (0,0) size 785x2982 backgroundClip at (0,0) size 785x600 clip at (0,0) ...@@ -29,77 +29,77 @@ layer at (0,0) size 785x2982 backgroundClip at (0,0) size 785x600 clip at (0,0)
text run at (0,0) width 507: "Right-To-Left containing replaced content blocking the ellipsis" text run at (0,0) width 507: "Right-To-Left containing replaced content blocking the ellipsis"
layer at (8,50) size 22x310 clip at (9,51) size 20x308 scrollHeight 718 layer at (8,50) size 22x310 clip at (9,51) size 20x308 scrollHeight 718
LayoutNGBlockFlow {DIV} at (0,41.72) size 22x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,41.72) size 22x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x303 LayoutText {#text} at (1,1) size 19x303
text run at (2,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (2,288) width 16: "\x{2026}" text run at (1,288) width 16: "\x{2026}"
layer at (8,421) size 82x310 backgroundClip at (8,421) size 82x179 clip at (9,422) size 80x178 scrollHeight 718 layer at (8,421) size 82x310 backgroundClip at (8,421) size 82x179 clip at (9,422) size 80x178 scrollHeight 718
LayoutNGBlockFlow {DIV} at (0,413.44) size 82x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,413.44) size 82x310 [border: (1px solid #000000)]
LayoutText {#text} at (62,1) size 19x303 LayoutText {#text} at (1,1) size 19x303
text run at (62,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,1) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (62,288) width 16: "\x{2026}" text run at (1,288) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (42,1) size 19x306 LayoutText {#text} at (21,1) size 19x306
text run at (42,1) width 290: "orem ipsum dolor sit amet, consectetur adipisc" text run at (21,1) width 290: "orem ipsum dolor sit amet, consectetur adipisc"
text run at (42,291) width 16: "\x{2026}" text run at (21,291) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (22,1) size 19x302 LayoutText {#text} at (41,1) size 19x302
text run at (22,1) width 286: "rem ipsum dolor sit amet, consectetur adipisci" text run at (41,1) width 286: "rem ipsum dolor sit amet, consectetur adipisci"
text run at (22,287) width 16: "\x{2026}" text run at (41,287) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (2,1) size 19x305 LayoutText {#text} at (61,1) size 19x305
text run at (2,1) width 289: "em ipsum dolor sit amet, consectetur adipiscin" text run at (61,1) width 289: "em ipsum dolor sit amet, consectetur adipiscin"
text run at (2,290) width 16: "\x{2026}" text run at (61,290) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
layer at (8,793) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 747 layer at (8,793) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 747
LayoutNGBlockFlow {DIV} at (0,785.16) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,785.16) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x181 LayoutText {#text} at (11,1) size 19x181
text run at (2,1) width 181: "Lorem ipsum dolor sit amet, " text run at (11,1) width 181: "Lorem ipsum dolor sit amet, "
LayoutImage {IMG} at (1,182) size 25x25 LayoutImage {IMG} at (1,182) size 25x25
LayoutText {#text} at (2,207) size 19x102 LayoutText {#text} at (11,207) size 19x102
text run at (2,207) width 86: " consectetur a" text run at (11,207) width 86: " consectetur a"
text run at (2,293) width 16: "\x{2026}" text run at (11,293) width 16: "\x{2026}"
layer at (8,1165) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 743 layer at (8,1165) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollHeight 743
LayoutNGBlockFlow {DIV} at (0,1156.88) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1156.88) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,1) size 19x287 LayoutText {#text} at (11,1) size 19x287
text run at (2,1) width 271: "Lorem ipsum dolor sit amet, consectetur ad" text run at (11,1) width 271: "Lorem ipsum dolor sit amet, consectetur ad"
text run at (2,272) width 16: "\x{2026}" text run at (11,272) width 16: "\x{2026}"
LayoutImage {IMG} at (0,0) size 25x25 LayoutImage {IMG} at (0,0) size 25x25
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
layer at (8,1537) size 22x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719 layer at (8,1537) size 22x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719
LayoutNGBlockFlow {DIV} at (0,1528.59) size 22x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1528.59) size 22x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,22) size 19x303 LayoutText {#text} at (1,22) size 19x303
text run at (2,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (2,6) width 16: "\x{2026}" text run at (1,6) width 16: "\x{2026}"
layer at (8,1908) size 82x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719 layer at (8,1908) size 82x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 411.00 scrollHeight 719
LayoutNGBlockFlow {DIV} at (0,1900.31) size 82x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,1900.31) size 82x310 [border: (1px solid #000000)]
LayoutText {#text} at (62,22) size 19x303 LayoutText {#text} at (1,22) size 19x303
text run at (62,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi" text run at (1,22) width 287: "Lorem ipsum dolor sit amet, consectetur adipi"
text run at (62,6) width 16: "\x{2026}" text run at (1,6) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (42,19) size 19x306 LayoutText {#text} at (21,19) size 19x306
text run at (42,19) width 290: "orem ipsum dolor sit amet, consectetur adipisc" text run at (21,19) width 290: "orem ipsum dolor sit amet, consectetur adipisc"
text run at (42,3) width 16: "\x{2026}" text run at (21,3) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (22,23) size 19x302 LayoutText {#text} at (41,23) size 19x302
text run at (22,23) width 286: "rem ipsum dolor sit amet, consectetur adipisci" text run at (41,23) width 286: "rem ipsum dolor sit amet, consectetur adipisci"
text run at (22,7) width 16: "\x{2026}" text run at (41,7) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
LayoutText {#text} at (2,20) size 19x305 LayoutText {#text} at (61,20) size 19x305
text run at (2,20) width 289: "em ipsum dolor sit amet, consectetur adipiscin" text run at (61,20) width 289: "em ipsum dolor sit amet, consectetur adipiscin"
text run at (2,4) width 16: "\x{2026}" text run at (61,4) width 16: "\x{2026}"
LayoutBR {BR} at (0,0) size 0x0 LayoutBR {BR} at (0,0) size 0x0
layer at (8,2280) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 440.00 scrollHeight 748 layer at (8,2280) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 440.00 scrollHeight 748
LayoutNGBlockFlow {DIV} at (0,2272.03) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,2272.03) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,128) size 19x181 LayoutText {#text} at (11,128) size 19x181
text run at (2,128) width 181: "Lorem ipsum dolor sit amet, " text run at (11,128) width 181: "Lorem ipsum dolor sit amet, "
LayoutImage {IMG} at (1,103) size 25x25 LayoutImage {IMG} at (1,103) size 25x25
LayoutText {#text} at (2,17) size 19x102 LayoutText {#text} at (11,17) size 19x102
text run at (2,17) width 86: " consectetur a" text run at (11,17) width 86: " consectetur a"
text run at (2,1) width 16: "\x{2026}" text run at (11,1) width 16: "\x{2026}"
layer at (8,2652) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 436.00 scrollHeight 744 layer at (8,2652) size 32x310 backgroundClip at (0,0) size 0x0 clip at (0,0) size 0x0 scrollY 436.00 scrollHeight 744
LayoutNGBlockFlow {DIV} at (0,2643.75) size 32x310 [border: (1px solid #000000)] LayoutNGBlockFlow {DIV} at (0,2643.75) size 32x310 [border: (1px solid #000000)]
LayoutText {#text} at (2,38) size 19x287 LayoutText {#text} at (11,38) size 19x287
text run at (2,38) width 271: "Lorem ipsum dolor sit amet, consectetur ad" text run at (11,38) width 271: "Lorem ipsum dolor sit amet, consectetur ad"
text run at (2,22) width 16: "\x{2026}" text run at (11,22) width 16: "\x{2026}"
LayoutImage {IMG} at (0,0) size 25x25 LayoutImage {IMG} at (0,0) size 25x25
LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/html/details_summary/details-marker-style-expected.txt
View file @ ccde8ca3
...@@ -13,8 +13,8 @@ layer at (0,0) size 800x477 ...@@ -13,8 +13,8 @@ layer at (0,0) size 800x477
LayoutNGBlockFlow {DETAILS} at (0,0) size 118.83x183.42 LayoutNGBlockFlow {DETAILS} at (0,0) size 118.83x183.42
LayoutNGBlockFlow {SUMMARY} at (0,0) size 118.83x183.42 LayoutNGBlockFlow {SUMMARY} at (0,0) size 118.83x183.42
LayoutDetailsMarker {DIV} at (0,0) size 111.83x79.83 [border: (8px solid #00FF00) (16px solid #00FF00) (24px solid #00FF00) (32px solid #00FF00)]: down LayoutDetailsMarker {DIV} at (0,0) size 111.83x79.83 [border: (8px solid #00FF00) (16px solid #00FF00) (24px solid #00FF00) (32px solid #00FF00)]: down
LayoutText {#text} at (1,89) size 27x95 LayoutText {#text} at (90,89) size 27x95
text run at (1,89) width 94: "Summary" text run at (90,89) width 95: "Summary"
LayoutNGBlockFlow {DIV} at (0,270.25) size 784x47 LayoutNGBlockFlow {DIV} at (0,270.25) size 784x47
LayoutNGBlockFlow {DETAILS} at (0,0) size 784x47 LayoutNGBlockFlow {DETAILS} at (0,0) size 784x47
LayoutNGBlockFlow {SUMMARY} at (0,0) size 784x47 LayoutNGBlockFlow {SUMMARY} at (0,0) size 784x47
...@@ -25,5 +25,5 @@ layer at (0,0) size 800x477 ...@@ -25,5 +25,5 @@ layer at (0,0) size 800x477
LayoutNGBlockFlow {DETAILS} at (0,0) size 71x143.59 LayoutNGBlockFlow {DETAILS} at (0,0) size 71x143.59
LayoutNGBlockFlow {SUMMARY} at (0,0) size 71x143.59 LayoutNGBlockFlow {SUMMARY} at (0,0) size 71x143.59
LayoutDetailsMarker {DIV} at (0,0) size 64x40 [border: (8px solid #00FF00)]: down LayoutDetailsMarker {DIV} at (0,0) size 64x40 [border: (8px solid #00FF00)]: down
LayoutText {#text} at (1,49) size 27x95 LayoutText {#text} at (43,49) size 27x95
text run at (1,49) width 94: "Summary" text run at (43,49) width 94: "Summary"
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/paint/invalidation/text-emphasis-h-expected.txt
View file @ ccde8ca3
...@@ -28,8 +28,8 @@ layer at (8,8) size 192x128 ...@@ -28,8 +28,8 @@ layer at (8,8) size 192x128
LayoutText {#text} at (16,0) size 32x128 LayoutText {#text} at (16,0) size 32x128
text run at (16,0) width 128: "1111" text run at (16,0) width 128: "1111"
LayoutNGBlockFlow {DIV} at (96,0) size 48x128 LayoutNGBlockFlow {DIV} at (96,0) size 48x128
LayoutText {#text} at (0,0) size 32x128
text run at (0,0) width 128: "1111"
LayoutNGBlockFlow {DIV} at (144,0) size 48x128
LayoutText {#text} at (16,0) size 32x128 LayoutText {#text} at (16,0) size 32x128
text run at (16,0) width 128: "1111" text run at (16,0) width 128: "1111"
LayoutNGBlockFlow {DIV} at (144,0) size 48x128
LayoutText {#text} at (0,0) size 32x128
text run at (0,0) width 128: "1111"
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/paint/selection/image-writing-modes-expected.txt
View file @ ccde8ca3
...@@ -22,11 +22,11 @@ layer at (0,0) size 785x756 backgroundClip at (0,0) size 785x600 clip at (0,0) s ...@@ -22,11 +22,11 @@ layer at (0,0) size 785x756 backgroundClip at (0,0) size 785x600 clip at (0,0) s
LayoutNGBlockFlow (anonymous) at (0,420) size 769x100 LayoutNGBlockFlow (anonymous) at (0,420) size 769x100
LayoutBR {BR} at (0,40) size 0x20 LayoutBR {BR} at (0,40) size 0x20
LayoutNGBlockFlow {DIV} at (0,520) size 200x120 LayoutNGBlockFlow {DIV} at (0,520) size 200x120
LayoutText {#text} at (140,0) size 20x60 LayoutText {#text} at (40,0) size 20x60
text run at (140,0) width 60: "foo" text run at (40,0) width 60: "foo"
LayoutImage {IMG} at (30,60) size 40x30 LayoutImage {IMG} at (30,60) size 40x30
LayoutImage {IMG} at (30,90) size 40x30 LayoutImage {IMG} at (30,90) size 40x30
LayoutBR {BR} at (140,120) size 20x0 LayoutBR {BR} at (40,120) size 20x0
LayoutImage {IMG} at (130,0) size 40x30 LayoutImage {IMG} at (130,0) size 40x30
LayoutNGBlockFlow (anonymous) at (0,640) size 769x100 LayoutNGBlockFlow (anonymous) at (0,640) size 769x100
LayoutBR {BR} at (0,40) size 0x20 LayoutBR {BR} at (0,40) size 0x20
......
third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/paint/selection/text-selection-newline-vertical-rl-expected.txt
View file @ ccde8ca3
...@@ -4,8 +4,8 @@ layer at (0,0) size 800x48 ...@@ -4,8 +4,8 @@ layer at (0,0) size 800x48
LayoutNGBlockFlow {HTML} at (0,0) size 800x48 LayoutNGBlockFlow {HTML} at (0,0) size 800x48
LayoutNGBlockFlow {BODY} at (8,8) size 784x32 LayoutNGBlockFlow {BODY} at (8,8) size 784x32
LayoutNGBlockFlow {DIV} at (0,0) size 32x32 LayoutNGBlockFlow {DIV} at (0,0) size 32x32
LayoutText {#text} at (16,0) size 32x32 LayoutText {#text} at (0,0) size 32x32
text run at (16,0) width 32: "xx" text run at (0,0) width 32: "xx"
text run at (0,0) width 16: "y" text run at (16,0) width 16: "y"
selection start: position 5 of child 0 {#text} of child 3 {DIV} of body selection start: position 5 of child 0 {#text} of child 3 {DIV} of body
selection end: position 9 of child 0 {#text} of child 3 {DIV} of body selection end: position 9 of child 0 {#text} of child 3 {DIV} of body
third_party/blink/renderer/core/layout/layout_text.cc
View file @ ccde8ca3
...@@ -1559,15 +1559,18 @@ UChar32 LayoutText::LastCharacterAfterWhitespaceCollapsing() const { ...@@ -1559,15 +1559,18 @@ UChar32 LayoutText::LastCharacterAfterWhitespaceCollapsing() const {
} }
FloatPoint LayoutText::FirstRunOrigin() const { FloatPoint LayoutText::FirstRunOrigin() const {
return FloatPoint(FirstRunX(), FirstRunY()); if (const NGPaintFragment* fragment = FirstInlineFragment()) {
} LayoutPoint origin = fragment->InlineOffsetToContainerBox().ToLayoutPoint();
if (UNLIKELY(HasFlippedBlocksWritingMode())) {
float LayoutText::FirstRunX() const { LayoutRect line_box_rect(origin, fragment->Size().ToLayoutSize());
return FirstTextBox() ? FirstTextBox()->X().ToFloat() : 0; ContainingBlock()->FlipForWritingMode(line_box_rect);
} return FloatPoint(line_box_rect.Location());
}
float LayoutText::FirstRunY() const { return FloatPoint(origin);
return FirstTextBox() ? FirstTextBox()->Y().ToFloat() : 0; }
if (const auto* text_box = FirstTextBox())
return FloatPoint(text_box->Location());
return FloatPoint();
} }
bool LayoutText::CanOptimizeSetText() const { bool LayoutText::CanOptimizeSetText() const {
...@@ -2396,19 +2399,7 @@ void LayoutText::InvalidateDisplayItemClients( ...@@ -2396,19 +2399,7 @@ void LayoutText::InvalidateDisplayItemClients(
// the first run's x and y, but that would involve updating many test results. // the first run's x and y, but that would involve updating many test results.
LayoutRect LayoutText::DebugRect() const { LayoutRect LayoutText::DebugRect() const {
IntRect lines_box = EnclosingIntRect(LinesBoundingBox()); IntRect lines_box = EnclosingIntRect(LinesBoundingBox());
FloatPoint first_run_offset; FloatPoint first_run_offset = FirstRunOrigin();
if (const NGPhysicalBoxFragment* box_fragment =
EnclosingBlockFlowFragment()) {
const auto fragments =
NGInlineFragmentTraversal::SelfFragmentsOf(*box_fragment, this);
if (fragments.size()) {
const auto& child = fragments[0];
first_run_offset = {child.offset_to_container_box.left.ToFloat(),
child.offset_to_container_box.top.ToFloat()};
}
} else {
first_run_offset = {FirstRunX(), FirstRunY()};
}
LayoutRect rect = LayoutRect rect =
LayoutRect(IntRect(first_run_offset.X(), first_run_offset.Y(), LayoutRect(IntRect(first_run_offset.X(), first_run_offset.Y(),
lines_box.Width(), lines_box.Height())); lines_box.Width(), lines_box.Height()));
......
third_party/blink/renderer/core/layout/layout_text.h
View file @ ccde8ca3
...@@ -187,8 +187,6 @@ class CORE_EXPORT LayoutText : public LayoutObject { ...@@ -187,8 +187,6 @@ class CORE_EXPORT LayoutText : public LayoutObject {
LayoutRect VisualOverflowRect() const; LayoutRect VisualOverflowRect() const;
FloatPoint FirstRunOrigin() const; FloatPoint FirstRunOrigin() const;
float FirstRunX() const;
float FirstRunY() const;
virtual void SetText(scoped_refptr<StringImpl>, virtual void SetText(scoped_refptr<StringImpl>,
bool force = false, bool force = false,
......
third_party/blink/renderer/core/layout/layout_tree_as_text.cc
View file @ ccde8ca3
...@@ -457,8 +457,19 @@ static void WriteTextFragment(WTF::TextStream& ts, ...@@ -457,8 +457,19 @@ static void WriteTextFragment(WTF::TextStream& ts,
return; return;
const NGPhysicalTextFragment& physical_text_fragment = const NGPhysicalTextFragment& physical_text_fragment =
ToNGPhysicalTextFragment(physical_fragment); ToNGPhysicalTextFragment(physical_fragment);
NGTextFragment fragment(physical_fragment.Style().GetWritingMode(), const ComputedStyle& style = physical_fragment.Style();
physical_text_fragment); NGTextFragment fragment(style.GetWritingMode(), physical_text_fragment);
if (UNLIKELY(style.IsFlippedBlocksWritingMode())) {
if (physical_fragment.GetLayoutObject()) {
LayoutRect rect(offset_to_container_box.ToLayoutPoint(),
physical_fragment.Size().ToLayoutSize());
const LayoutBlock* containing_block =
physical_fragment.GetLayoutObject()->ContainingBlock();
containing_block->FlipForWritingMode(rect);
offset_to_container_box.left = rect.X();
}
}
// See WriteTextRun() for why we convert to int. // See WriteTextRun() for why we convert to int.
int x = offset_to_container_box.left.ToInt(); int x = offset_to_container_box.left.ToInt();
int y = offset_to_container_box.top.ToInt(); int y = offset_to_container_box.top.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