Title: [290263] trunk/LayoutTests
Revision
290263
Author
hironori.fu...@sony.com
Date
2022-02-21 13:20:12 -0800 (Mon, 21 Feb 2022)

Log Message

[WinCairo] Unreviewed test gardening

* platform/wincairo/TestExpectations:
* platform/wincairo/fast/css/font-face-implicit-local-font-expected.txt:
* platform/wincairo/fast/text/international/bidi-layout-across-linebreak-expected.txt:
* platform/wincairo/fast/text/international/bidi-override-expected.txt:
* platform/wincairo/fast/text/international/text-combine-image-test-expected.txt:
* platform/wincairo/fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (290262 => 290263)


--- trunk/LayoutTests/ChangeLog	2022-02-21 20:49:00 UTC (rev 290262)
+++ trunk/LayoutTests/ChangeLog	2022-02-21 21:20:12 UTC (rev 290263)
@@ -1,3 +1,14 @@
+2022-02-21  Fujii Hironori  <hironori.fu...@sony.com>
+
+        [WinCairo] Unreviewed test gardening
+
+        * platform/wincairo/TestExpectations:
+        * platform/wincairo/fast/css/font-face-implicit-local-font-expected.txt:
+        * platform/wincairo/fast/text/international/bidi-layout-across-linebreak-expected.txt:
+        * platform/wincairo/fast/text/international/bidi-override-expected.txt:
+        * platform/wincairo/fast/text/international/text-combine-image-test-expected.txt:
+        * platform/wincairo/fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt:
+
 2022-02-21  Rob Buis  <rb...@igalia.com>
 
         Null check parent node in outdentParagraph

Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (290262 => 290263)


--- trunk/LayoutTests/platform/wincairo/TestExpectations	2022-02-21 20:49:00 UTC (rev 290262)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations	2022-02-21 21:20:12 UTC (rev 290263)
@@ -390,13 +390,6 @@
 webkit.org/b/219842 fast/events/wheel/wheel-events-become-non-cancelable.html [ Skip ]
 
 # Needs WebGL video texture support
-webgl/1.0.3/conformance/extensions/oes-texture-float-with-video.html [ Skip ]
-webgl/1.0.3/conformance/extensions/oes-texture-half-float-with-video.html [ Skip ]
-webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html [ Skip ]
-webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html [ Skip ]
-webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html [ Skip ]
-webgl/1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-video.html [ Skip ]
-webgl/1.0.x/conformance/textures/misc/texture-corner-case-videos.html [ Skip ]
 webgl/2.0.0/conformance/extensions/oes-texture-float-with-video.html [ Skip ]
 webgl/2.0.0/conformance/extensions/oes-texture-half-float-with-video.html [ Skip ]
 webgl/2.0.0/conformance/textures/image_bitmap_from_video [ Skip ]
@@ -531,7 +524,6 @@
 css3/masking/clip-path-reference.html [ ImageOnlyFailure ]
 css3/masking/mask-repeat-space-border.html [ ImageOnlyFailure ]
 css3/masking/mask-repeat-space-content.html [ ImageOnlyFailure ]
-css3/masking/mask-repeat-space-padding.html [ ImageOnlyFailure ]
 
 fast/css/absolute-child-with-percent-height-inside-relative-parent.html [ Failure ]
 fast/css/background-image-with-baseurl.html [ Failure ]
@@ -826,7 +818,6 @@
 http/tests/misc/form-submit-file-cross-site.html [ Skip ]
 http/tests/misc/link-rel-icon-beforeload.html [ Failure ]
 http/tests/misc/object-embedding-svg-delayed-size-negotiation.xhtml [ Failure ]
-http/tests/misc/submit-post-keygen.html [ Skip ]
 http/tests/misc/timer-vs-loading.html [ Skip ]
 http/tests/misc/webtiming-cross-origin-and-back1.html [ Failure Pass ]
 http/tests/misc/webtiming-no-origin.html [ Failure Pass ]
@@ -848,6 +839,7 @@
 http/tests/plugins [ Skip ]
 http/tests/pointer-lock [ Skip ]
 http/tests/preconnect [ Skip ]
+http/tests/push-api [ Skip ]
 http/tests/preload [ Skip ]
 http/tests/quicklook [ Skip ]
 http/tests/referrer-policy-iframe [ Skip ]
@@ -996,7 +988,7 @@
 
 imported/blink/compositing/video/video-controls-layer-creation-squashing.html [ Skip ]
 
-# WinCairo DRT and WTR don't support pixel dump yet
+# WinCairo DRT doesn't support pixel dump yet
 webkit.org/b/215041 webgl/smell-test.html [ Skip ]
 webkit.org/b/215041 webgl/webgl-backing-store-size-update.html [ Skip ]
 webkit.org/b/215041 webgl/webgl-border.html [ Skip ]
@@ -1682,6 +1674,8 @@
 userscripts [ Skip ]
 webanimations [ Skip ]
 webexposed [ Skip ]
+webgl/1.0.3 [ Skip ]
+webgl/1.0.x [ Skip ]
 webgl/2.0.0/conformance/textures/image_bitmap_from_image_bitmap [ Skip ]
 webgl/2.0.0/conformance2/textures/image_bitmap_from_image_bitmap [ Skip ]
 webxr [ Skip ]
@@ -1705,12 +1699,6 @@
 [ Debug ] loader/load-defer-resume-crash.html [ Skip ]
 [ Debug ] storage/indexeddb/database-odd-names.html [ Failure Pass ]
 [ Debug ] storage/indexeddb/primary-key-unique-to-objectstore.html [ Timeout Pass ]
-[ Debug ] webgl/1.0.3/conformance/canvas/drawingbuffer-test.html [ Skip ] # Crash by assertion failure
-[ Debug ] webgl/1.0.3/conformance/glsl/bugs/long-expressions-should-not-crash.html [ Skip ] # Slow
-[ Debug ] webgl/1.0.3/conformance/rendering/many-draw-calls.html [ Skip ] # Slow
-[ Debug ] webgl/1.0.3/conformance/rendering/multisample-corruption.html [ Skip ] # Slow
-[ Debug ] webgl/1.0.3/conformance/state/gl-object-get-calls.html [ Skip ] # Slow
-[ Debug ] webgl/1.0.3/conformance/textures/texture-size-limit.html [ Skip ] # Slow
 [ Debug ] webgl/2.0.0/conformance/attribs/gl-vertexattribpointer.html [ Skip ] # Slow
 [ Debug ] webgl/2.0.0/conformance/canvas/drawingbuffer-test.html [ Skip ] # Crash by assertion failure
 [ Debug ] webgl/2.0.0/conformance/glsl/bugs/complex-glsl-does-not-crash.html [ Skip ] # Slow
@@ -1729,7 +1717,6 @@
 [ Debug ] webgl/2.0.0/conformance2/textures/misc/copy-texture-image-luma-format.html [ Skip ] # Slow
 [ Release ] editing/selection/caret-rtl-2-left.html [ Pass Failure ]
 [ Release ] fetch/fetch-worker-crash.html [ Pass Timeout ]
-[ Release ] webgl/1.0.3/conformance/canvas/drawingbuffer-test.html [ Failure ]
 [ Release ] webgl/2.0.0/conformance/canvas/drawingbuffer-test.html [ Crash Failure ]
 accessibility/canvas-fallback-content.html [ Timeout ]
 animations/shadow-host-child-change.html [ Skip ]
@@ -1971,7 +1958,6 @@
 fast/text/ruby-justification-flush.html [ ImageOnlyFailure ]
 fast/text/shadow-no-blur.html [ Failure ]
 fast/text/shadow-translucent-fill.html [ Failure ]
-fast/text/simple-line-layout-simple-text-but-complex-font-path.html [ ImageOnlyFailure ]
 fast/text/simple-line-layout-text-stroke-width.html [ Failure ]
 fast/text/simple-line-wordspacing.html [ ImageOnlyFailure ]
 fast/text/small-caps-web-font.html [ ImageOnlyFailure ]
@@ -1987,7 +1973,6 @@
 fast/text/tatechuyoko.html [ Failure Pass ]
 fast/text/text-indent-inside-float.html [ ImageOnlyFailure ]
 fast/text/text-transform-turkish-and-azeri.html [ ImageOnlyFailure ]
-fast/text/trailing-word-detection.html [ Failure ]
 fast/text/trak-optimizeLegibility.html [ ImageOnlyFailure ]
 fast/text/trimmable-whitespace-followed-by-br.html [ ImageOnlyFailure ]
 fast/text/updateNewFont.html [ Failure ]
@@ -2073,15 +2058,6 @@
 storage/indexeddb/shared-memory-structured-clone.html [ Timeout ]
 storage/indexeddb/structured-clone-image-data-display-p3.html [ Failure ]
 storage/indexeddb/value-cursor-cycle.html [ Failure Pass ]
-webgl/1.0.3/conformance/context/premultiplyalpha-test.html [ Failure ]
-webgl/1.0.3/conformance/glsl/bugs/array-of-struct-with-int-first-position.html [ Skip ] # This test makes DumpRenderTree process unable to exit
-webgl/1.0.3/conformance/more/functions/readPixelsBadArgs.html [ Failure ]
-webgl/1.0.3/conformance/more/functions/texImage2DHTML.html [ Failure ]
-webgl/1.0.3/conformance/more/functions/texSubImage2DHTML.html [ Failure ]
-webgl/1.0.3/conformance/textures/texture-mips.html [ Pass Failure ]
-webgl/1.0.3/conformance/textures/texture-upload-size.html [ Skip ] # Timeout
-webgl/1.0.3/conformance/uniforms/out-of-bounds-uniform-array-access.html [ Skip ] # Timeout
-webgl/1.0.3/conformance/uniforms/uniform-default-values.html [ Failure Pass ]
 webgl/2.0.0/conformance/canvas/drawingbuffer-static-canvas-test.html [ Failure Pass ]
 webgl/2.0.0/conformance/canvas/framebuffer-bindings-affected-by-to-data-url.html [ Skip ] # Crash
 webgl/2.0.0/conformance/context/premultiplyalpha-test.html [ Failure ]

Modified: trunk/LayoutTests/platform/wincairo/fast/css/font-face-implicit-local-font-expected.txt (290262 => 290263)


--- trunk/LayoutTests/platform/wincairo/fast/css/font-face-implicit-local-font-expected.txt	2022-02-21 20:49:00 UTC (rev 290262)
+++ trunk/LayoutTests/platform/wincairo/fast/css/font-face-implicit-local-font-expected.txt	2022-02-21 21:20:12 UTC (rev 290263)
@@ -14,7 +14,7 @@
           text run at (0,0) width 419: "In the next line, the digits should be in Times, but the letters should be "
           text run at (419,0) width 64: "in Courier."
       RenderBlock (anonymous) at (0,92) size 784x28
-        RenderInline {SPAN} at (0,0) size 276x27
-          RenderText {#text} at (0,0) size 276x27
-            text run at (0,0) width 276: "ABCDEFGHIJ 1234567890"
+        RenderInline {SPAN} at (0,0) size 277x27
+          RenderText {#text} at (0,0) size 277x27
+            text run at (0,0) width 277: "ABCDEFGHIJ 1234567890"
         RenderText {#text} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/wincairo/fast/text/international/bidi-layout-across-linebreak-expected.txt (290262 => 290263)


--- trunk/LayoutTests/platform/wincairo/fast/text/international/bidi-layout-across-linebreak-expected.txt	2022-02-21 20:49:00 UTC (rev 290262)
+++ trunk/LayoutTests/platform/wincairo/fast/text/international/bidi-layout-across-linebreak-expected.txt	2022-02-21 21:20:12 UTC (rev 290263)
@@ -67,18 +67,18 @@
               RenderText {#text} at (3,3) size 8x19
                 text run at (3,3) width 8: "3"
             RenderTableCell {TD} at (32,115) size 46x45 [border: (1px solid #008000)] [r=3 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 16x19
-                text run at (2,3) width 16 RTL: "\x{5D0}\x{5D0}"
-              RenderBR {BR} at (2,3) size 0x19
-              RenderText {#text} at (2,23) size 20x19
-                text run at (2,23) width 8: "b"
-                text run at (10,23) width 4 RTL: " "
-                text run at (14,23) width 8: "1"
+              RenderText {#text} at (3,3) size 16x19
+                text run at (3,3) width 16 RTL: "\x{5D0}\x{5D0}"
+              RenderBR {BR} at (3,3) size 0x19
+              RenderText {#text} at (3,23) size 20x19
+                text run at (3,23) width 8: "b"
+                text run at (11,23) width 4 RTL: " "
+                text run at (15,23) width 8: "1"
             RenderTableCell {TD} at (77,115) size 34x45 [border: (1px solid #008000)] [r=3 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 28x39
-                text run at (2,3) width 8: "1"
-                text run at (10,3) width 20 RTL: "\x{5D0}\x{5D0} "
-                text run at (2,23) width 8: "b"
+              RenderText {#text} at (3,3) size 28x39
+                text run at (3,3) width 8: "1"
+                text run at (11,3) width 20 RTL: "\x{5D0}\x{5D0} "
+                text run at (3,23) width 8: "b"
             RenderTableCell {TD} at (111,115) size 45x45 [border: (1px solid #008000)] [r=3 c=3 rs=1 cs=1]
               RenderBlock {P} at (3,3) size 40x20
                 RenderText {#text} at (0,0) size 16x19
@@ -91,17 +91,17 @@
               RenderText {#text} at (3,3) size 8x19
                 text run at (3,3) width 8: "4"
             RenderTableCell {TD} at (32,160) size 46x45 [border: (1px solid #008000)] [r=4 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 14x19
-                text run at (2,3) width 14: "aa"
-              RenderBR {BR} at (2,3) size 0x19
-              RenderText {#text} at (2,23) size 20x19
-                text run at (2,23) width 8: "b"
-                text run at (10,23) width 4 RTL: " "
-                text run at (14,23) width 8: "1"
+              RenderText {#text} at (3,3) size 14x19
+                text run at (3,3) width 14: "aa"
+              RenderBR {BR} at (3,3) size 0x19
+              RenderText {#text} at (3,23) size 20x19
+                text run at (3,23) width 8: "b"
+                text run at (11,23) width 4 RTL: " "
+                text run at (15,23) width 8: "1"
             RenderTableCell {TD} at (77,160) size 34x45 [border: (1px solid #008000)] [r=4 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 26x39
-                text run at (2,3) width 26: "aa 1"
-                text run at (2,23) width 8: "b"
+              RenderText {#text} at (3,3) size 26x39
+                text run at (3,3) width 26: "aa 1"
+                text run at (3,23) width 8: "b"
             RenderTableCell {TD} at (111,160) size 45x45 [border: (1px solid #008000)] [r=4 c=3 rs=1 cs=1]
               RenderBlock {P} at (3,3) size 40x20
                 RenderText {#text} at (0,0) size 14x19
@@ -114,17 +114,17 @@
               RenderText {#text} at (3,3) size 8x19
                 text run at (3,3) width 8: "5"
             RenderTableCell {TD} at (32,205) size 46x45 [border: (1px solid #008000)] [r=5 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 16x19
-                text run at (2,3) width 16 RTL: "\x{5D0}\x{5D0}"
-              RenderBR {BR} at (2,3) size 0x19
-              RenderText {#text} at (2,23) size 19x19
-                text run at (2,23) width 11 RTL: " \x{5D1}"
-                text run at (13,23) width 8: "1"
+              RenderText {#text} at (3,3) size 16x19
+                text run at (3,3) width 16 RTL: "\x{5D0}\x{5D0}"
+              RenderBR {BR} at (3,3) size 0x19
+              RenderText {#text} at (3,23) size 19x19
+                text run at (3,23) width 11 RTL: " \x{5D1}"
+                text run at (14,23) width 8: "1"
             RenderTableCell {TD} at (77,205) size 34x45 [border: (1px solid #008000)] [r=5 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 28x39
-                text run at (2,3) width 8: "1"
-                text run at (10,3) width 20 RTL: "\x{5D0}\x{5D0} "
-                text run at (2,23) width 7 RTL: "\x{5D1}"
+              RenderText {#text} at (3,3) size 28x39
+                text run at (3,3) width 8: "1"
+                text run at (11,3) width 20 RTL: "\x{5D0}\x{5D0} "
+                text run at (3,23) width 7 RTL: "\x{5D1}"
             RenderTableCell {TD} at (111,205) size 45x45 [border: (1px solid #008000)] [r=5 c=3 rs=1 cs=1]
               RenderBlock {P} at (3,3) size 40x20
                 RenderText {#text} at (0,0) size 16x19
@@ -137,16 +137,16 @@
               RenderText {#text} at (3,3) size 8x19
                 text run at (3,3) width 8: "6"
             RenderTableCell {TD} at (32,250) size 46x45 [border: (1px solid #008000)] [r=6 c=1 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 14x19
-                text run at (2,3) width 14: "aa"
-              RenderBR {BR} at (2,3) size 0x19
-              RenderText {#text} at (2,23) size 19x19
-                text run at (2,23) width 11 RTL: " \x{5D1}"
-                text run at (13,23) width 8: "1"
+              RenderText {#text} at (3,3) size 14x19
+                text run at (3,3) width 14: "aa"
+              RenderBR {BR} at (3,3) size 0x19
+              RenderText {#text} at (3,23) size 19x19
+                text run at (3,23) width 11 RTL: " \x{5D1}"
+                text run at (14,23) width 8: "1"
             RenderTableCell {TD} at (77,250) size 34x45 [border: (1px solid #008000)] [r=6 c=2 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 26x39
-                text run at (2,3) width 26: "aa 1"
-                text run at (2,23) width 7 RTL: "\x{5D1}"
+              RenderText {#text} at (3,3) size 26x39
+                text run at (3,3) width 26: "aa 1"
+                text run at (3,23) width 7 RTL: "\x{5D1}"
             RenderTableCell {TD} at (111,250) size 45x45 [border: (1px solid #008000)] [r=6 c=3 rs=1 cs=1]
               RenderBlock {P} at (3,3) size 40x20
                 RenderText {#text} at (0,0) size 14x19

Modified: trunk/LayoutTests/platform/wincairo/fast/text/international/bidi-override-expected.txt (290262 => 290263)


--- trunk/LayoutTests/platform/wincairo/fast/text/international/bidi-override-expected.txt	2022-02-21 20:49:00 UTC (rev 290262)
+++ trunk/LayoutTests/platform/wincairo/fast/text/international/bidi-override-expected.txt	2022-02-21 21:20:12 UTC (rev 290263)
@@ -21,14 +21,14 @@
                 text run at (141,5) width 22: "abc"
                 text run at (163,5) width 39 RTL: "\x{5D0}\x{5D1}\x{5D2}\x{5D3}\x{5D4}\x{5D5}"
             RenderTableCell {TD} at (299,0) size 206x29 [border: (1px solid #008000)] [r=0 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,5) size 197x19
-                text run at (4,5) width 39 RTL: "\x{5D6}\x{5D7}\x{5D8}\x{5D9}\x{5DB}\x{5DC}"
-                text run at (43,5) width 22: "abc"
-                text run at (65,5) width 39 RTL: "\x{5D0}\x{5D1}\x{5D2}\x{5D3}\x{5D4}\x{5D5}"
-                text run at (104,5) width 4 RTL: " "
-                text run at (108,5) width 41: "abcdef"
-                text run at (149,5) width 20 RTL: "\x{5D0}\x{5D1}\x{5D2}"
-                text run at (169,5) width 32: "ghijkl"
+              RenderText {#text} at (5,5) size 197x19
+                text run at (5,5) width 39 RTL: "\x{5D6}\x{5D7}\x{5D8}\x{5D9}\x{5DB}\x{5DC}"
+                text run at (44,5) width 22: "abc"
+                text run at (66,5) width 39 RTL: "\x{5D0}\x{5D1}\x{5D2}\x{5D3}\x{5D4}\x{5D5}"
+                text run at (105,5) width 4 RTL: " "
+                text run at (109,5) width 41: "abcdef"
+                text run at (150,5) width 20 RTL: "\x{5D0}\x{5D1}\x{5D2}"
+                text run at (170,5) width 32: "ghijkl"
           RenderTableRow {TR} at (0,29) size 505x29
             RenderTableCell {TD} at (0,29) size 93x29 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (9,5) size 80x19
@@ -48,19 +48,19 @@
               RenderText {#text} at (102,5) size 18x19
                 text run at (102,5) width 18 RTL: "\x{5D9}\x{5DB}\x{5DC}"
             RenderTableCell {TD} at (299,29) size 206x29 [border: (1px solid #008000)] [r=1 c=2 rs=1 cs=1]
-              RenderText {#text} at (108,5) size 22x19
-                text run at (108,5) width 22: "abc"
+              RenderText {#text} at (109,5) size 22x19
+                text run at (109,5) width 22: "abc"
               RenderInline {SPAN} at (0,0) size 56x19
-                RenderText {#text} at (130,5) size 56x19
-                  text run at (130,5) width 56 RTL: "ihg\x{5D0}\x{5D1}\x{5D2}fed"
-              RenderText {#text} at (84,5) size 117x19
-                text run at (84,5) width 24 RTL: " \x{5D0}\x{5D1}\x{5D2}"
-                text run at (186,5) width 15: "jkl"
+                RenderText {#text} at (131,5) size 56x19
+                  text run at (131,5) width 56 RTL: "ihg\x{5D0}\x{5D1}\x{5D2}fed"
+              RenderText {#text} at (85,5) size 117x19
+                text run at (85,5) width 24 RTL: " \x{5D0}\x{5D1}\x{5D2}"
+                text run at (187,5) width 15: "jkl"
               RenderInline {SPAN} at (0,0) size 62x19
-                RenderText {#text} at (22,5) size 62x19
-                  text run at (22,5) width 62: "\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
-              RenderText {#text} at (4,5) size 18x19
-                text run at (4,5) width 18 RTL: "\x{5D9}\x{5DB}\x{5DC}"
+                RenderText {#text} at (23,5) size 62x19
+                  text run at (23,5) width 62: "\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
+              RenderText {#text} at (5,5) size 18x19
+                text run at (5,5) width 18 RTL: "\x{5D9}\x{5DB}\x{5DC}"
           RenderTableRow {TR} at (0,58) size 505x29
             RenderTableCell {TD} at (0,58) size 93x29 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (5,5) size 84x19
@@ -86,23 +86,23 @@
                   text run at (102,5) width 18 RTL: "\x{5D9}\x{5DB}\x{5DC}"
             RenderTableCell {TD} at (299,58) size 206x29 [border: (1px solid #008000)] [r=2 c=2 rs=1 cs=1]
               RenderInline {SPAN} at (0,0) size 93x19
-                RenderText {#text} at (108,5) size 22x19
-                  text run at (108,5) width 22: "abc"
+                RenderText {#text} at (109,5) size 22x19
+                  text run at (109,5) width 22: "abc"
                 RenderInline {SPAN} at (0,0) size 56x19
-                  RenderText {#text} at (130,5) size 56x19
-                    text run at (130,5) width 56 RTL: "ihg\x{5D0}\x{5D1}\x{5D2}fed"
-                RenderText {#text} at (186,5) size 15x19
-                  text run at (186,5) width 15: "jkl"
-              RenderText {#text} at (104,5) size 4x19
-                text run at (104,5) width 4 RTL: " "
+                  RenderText {#text} at (131,5) size 56x19
+                    text run at (131,5) width 56 RTL: "ihg\x{5D0}\x{5D1}\x{5D2}fed"
+                RenderText {#text} at (187,5) size 15x19
+                  text run at (187,5) width 15: "jkl"
+              RenderText {#text} at (105,5) size 4x19
+                text run at (105,5) width 4 RTL: " "
               RenderInline {SPAN} at (0,0) size 100x19
-                RenderText {#text} at (84,5) size 20x19
-                  text run at (84,5) width 20 RTL: "\x{5D0}\x{5D1}\x{5D2}"
+                RenderText {#text} at (85,5) size 20x19
+                  text run at (85,5) width 20 RTL: "\x{5D0}\x{5D1}\x{5D2}"
                 RenderInline {SPAN} at (0,0) size 62x19
-                  RenderText {#text} at (22,5) size 62x19
-                    text run at (22,5) width 62: "\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
-                RenderText {#text} at (4,5) size 18x19
-                  text run at (4,5) width 18 RTL: "\x{5D9}\x{5DB}\x{5DC}"
+                  RenderText {#text} at (23,5) size 62x19
+                    text run at (23,5) width 62: "\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
+                RenderText {#text} at (5,5) size 18x19
+                  text run at (5,5) width 18 RTL: "\x{5D9}\x{5DB}\x{5DC}"
           RenderTableRow {TR} at (0,87) size 505x29
             RenderTableCell {TD} at (0,87) size 93x29 [border: (1px solid #008000)] [r=3 c=0 rs=1 cs=1]
               RenderText {#text} at (38,5) size 51x19
@@ -116,14 +116,14 @@
                 text run at (120,5) width 62: "\x{202D}\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
                 text run at (182,5) width 20 RTL: "\x{5D0}\x{5D1}\x{5D2}"
             RenderTableCell {TD} at (299,87) size 206x29 [border: (1px solid #008000)] [r=3 c=2 rs=1 cs=1]
-              RenderText {#text} at (4,5) size 197x19
-                text run at (4,5) width 18 RTL: "\x{202C}\x{5D9}\x{5DB}\x{5DC}"
-                text run at (22,5) width 62: "\x{202D}\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
-                text run at (84,5) width 20 RTL: "\x{5D0}\x{5D1}\x{5D2}"
-                text run at (104,5) width 4 RTL: " "
-                text run at (108,5) width 22: "abc"
-                text run at (130,5) width 56 RTL: "\x{202E}ihg\x{5D0}\x{5D1}\x{5D2}fed"
-                text run at (186,5) width 15: "\x{202C}jkl"
+              RenderText {#text} at (5,5) size 197x19
+                text run at (5,5) width 18 RTL: "\x{202C}\x{5D9}\x{5DB}\x{5DC}"
+                text run at (23,5) width 62: "\x{202D}\x{5D8}\x{5D7}\x{5D6}abc\x{5D5}\x{5D4}\x{5D3}"
+                text run at (85,5) width 20 RTL: "\x{5D0}\x{5D1}\x{5D2}"
+                text run at (105,5) width 4 RTL: " "
+                text run at (109,5) width 22: "abc"
+                text run at (131,5) width 56 RTL: "\x{202E}ihg\x{5D0}\x{5D1}\x{5D2}fed"
+                text run at (187,5) width 15: "\x{202C}jkl"
       RenderBlock {P} at (0,169) size 784x20
         RenderText {#text} at (0,0) size 367x19
           text run at (0,0) width 367: "The CSS column should be identical to the reference column."

Modified: trunk/LayoutTests/platform/wincairo/fast/text/international/text-combine-image-test-expected.txt (290262 => 290263)


--- trunk/LayoutTests/platform/wincairo/fast/text/international/text-combine-image-test-expected.txt	2022-02-21 20:49:00 UTC (rev 290262)
+++ trunk/LayoutTests/platform/wincairo/fast/text/international/text-combine-image-test-expected.txt	2022-02-21 21:20:12 UTC (rev 290263)
@@ -118,10 +118,10 @@
               text run at (1,221) width 24: "\x{65E5}"
           RenderInline {SPAN} at (0,0) size 130x579
             RenderText {#text} at (8,0) size 130x579
-              text run at (8,0) width 320: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}\x{305F}\x{3057}\x{306F}"
+              text run at (8,0) width 319: "\x{305D}\x{306E}\x{5973}\x{304C}\x{306D}\x{304B}\x{3057}\x{3064}\x{3051}\x{306B}\x{6765}\x{3066}\x{304F}\x{308C}\x{308B}\x{307E}\x{3067}\x{3001}\x{308F}\x{305F}\x{3057}\x{306F}"
               text run at (45,0) width 576: "\x{3051}\x{3063}\x{3057}\x{3066}\x{306D}\x{3069}\x{3053}\x{306B}\x{306F}\x{306F}\x{3044}\x{3089}\x{306A}\x{304B}\x{3063}\x{305F}\x{3002}\x{51AC}\x{306E}\x{3042}\x{3089}\x{3057}\x{304C}\x{3060}\x{3093}\x{3054}\x{306E}\x{3088}\x{3046}\x{306A}\x{96EA}\x{3092}\x{3075}\x{304D}\x{3064}\x{3051}\x{3066}\x{7A93}\x{30AC}\x{30E9}"
               text run at (82,0) width 579: "\x{30B9}\x{3092}\x{767D}\x{304F}\x{3059}\x{308B}\x{3058}\x{3076}\x{3093}\x{306B}\x{306A}\x{308B}\x{3068}\x{3001}\x{3053}\x{306E}\x{5973}\x{306E}\x{4EBA}\x{306F}\x{4E21}\x{624B}\x{306E}\x{9593}\x{306B}\x{308F}\x{305F}\x{3057}\x{306E}\x{8DB3}\x{3092}\x{304A}\x{3055}\x{3048}\x{3066}\x{3001}\x{6B4C}\x{3092}\x{6B4C}\x{3044}"
-              text run at (119,0) width 436: "\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
+              text run at (119,0) width 435: "\x{306A}\x{304C}\x{3089}\x{6696}\x{3081}\x{3066}\x{304F}\x{308C}\x{305F}\x{3002}\x{305D}\x{306E}\x{6B4C}\x{306E}\x{7BC0}\x{3082}\x{6587}\x{53E5}\x{3082}\x{3001}\x{3044}\x{307E}\x{306B}\x{5FD8}\x{308C}\x{305A}\x{306B}\x{3044}\x{308B}\x{3002}"
           RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (479,0) size 0x584
         RenderInline {SPAN} at (0,0) size 0x0

Modified: trunk/LayoutTests/platform/wincairo/fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt (290262 => 290263)


--- trunk/LayoutTests/platform/wincairo/fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt	2022-02-21 20:49:00 UTC (rev 290262)
+++ trunk/LayoutTests/platform/wincairo/fast/text/whitespace/nbsp-mode-and-linewraps-expected.txt	2022-02-21 21:20:12 UTC (rev 290263)
@@ -5,10 +5,10 @@
     RenderBody {BODY} at (8,8) size 784x584
 layer at (100,8) size 700x196
   RenderBlock (positioned) {DIV} at (100,8) size 700x196 [border: (2px solid #FF0000)]
-    RenderText {#text} at (14,14) size 652x167
-      text run at (14,14) width 652: "This div is absolutely positioned to the left. All the spaces in this div"
-      text run at (14,42) width 637: "are replaced with non-breaking spaces, and the nbsp-mode for this"
-      text run at (14,70) width 605: "div is 'space', so when calculating line breaks, the non-breaking"
-      text run at (14,98) width 652: "spaces should be treated as normal spaces. If this isn't the case, then"
-      text run at (14,126) width 619: "all the text for this paragraph will be rendered in two lines, and a"
+    RenderText {#text} at (14,14) size 658x167
+      text run at (14,14) width 658: "This div is absolutely positioned to the left. All the spaces in this div "
+      text run at (14,42) width 643: "are replaced with non-breaking spaces, and the nbsp-mode for this "
+      text run at (14,70) width 611: "div is 'space', so when calculating line breaks, the non-breaking "
+      text run at (14,98) width 658: "spaces should be treated as normal spaces. If this isn't the case, then "
+      text run at (14,126) width 625: "all the text for this paragraph will be rendered in two lines, and a "
       text run at (14,154) width 477: "horizontal scroll bar will appear along the bottom."
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to