Title: [232103] trunk
Revision
232103
Author
mmaxfi...@apple.com
Date
2018-05-22 20:47:54 -0700 (Tue, 22 May 2018)

Log Message

Text can wrap between hyphens and commas
https://bugs.webkit.org/show_bug.cgi?id=185899
<rdar://problem/40118983>

Reviewed by Zalan Bujtas.

Source/WebCore:

Chrome, Firefox, and ICU all agree that text shouldn't wrap there.

Test: fast/text/line-break-hyphen-comma.html

* rendering/BreakLines.cpp:

LayoutTests:

* fast/text/line-break-hyphen-comma-expected.html: Added.
* fast/text/line-break-hyphen-comma.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (232102 => 232103)


--- trunk/LayoutTests/ChangeLog	2018-05-23 03:19:20 UTC (rev 232102)
+++ trunk/LayoutTests/ChangeLog	2018-05-23 03:47:54 UTC (rev 232103)
@@ -1,3 +1,14 @@
+2018-05-22  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        Text can wrap between hyphens and commas
+        https://bugs.webkit.org/show_bug.cgi?id=185899
+        <rdar://problem/40118983>
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/text/line-break-hyphen-comma-expected.html: Added.
+        * fast/text/line-break-hyphen-comma.html: Added.
+
 2018-05-22  David Fenton  <david_fen...@apple.com>
 
         Update test expectations for newly imported css-text layout tests

Added: trunk/LayoutTests/fast/text/line-break-hyphen-comma-expected.html (0 => 232103)


--- trunk/LayoutTests/fast/text/line-break-hyphen-comma-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/text/line-break-hyphen-comma-expected.html	2018-05-23 03:47:54 UTC (rev 232103)
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that there is no line break allowed between a hyphen and a comma. The test passes if there is no line break below.
+<div style="font: 100px monospace;">-,</div>
+</body>
+</html>

Added: trunk/LayoutTests/fast/text/line-break-hyphen-comma.html (0 => 232103)


--- trunk/LayoutTests/fast/text/line-break-hyphen-comma.html	                        (rev 0)
+++ trunk/LayoutTests/fast/text/line-break-hyphen-comma.html	2018-05-23 03:47:54 UTC (rev 232103)
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that there is no line break allowed between a hyphen and a comma. The test passes if there is no line break below.
+<div style="width: 80px; font: 100px monospace;">-,</div>
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (232102 => 232103)


--- trunk/Source/WebCore/ChangeLog	2018-05-23 03:19:20 UTC (rev 232102)
+++ trunk/Source/WebCore/ChangeLog	2018-05-23 03:47:54 UTC (rev 232103)
@@ -1,3 +1,17 @@
+2018-05-22  Myles C. Maxfield  <mmaxfi...@apple.com>
+
+        Text can wrap between hyphens and commas
+        https://bugs.webkit.org/show_bug.cgi?id=185899
+        <rdar://problem/40118983>
+
+        Reviewed by Zalan Bujtas.
+
+        Chrome, Firefox, and ICU all agree that text shouldn't wrap there.
+
+        Test: fast/text/line-break-hyphen-comma.html
+
+        * rendering/BreakLines.cpp:
+
 2018-05-22  Simon Fraser  <simon.fra...@apple.com>
 
         Add notifyutil callbacks to dump the memory cache, and the list of live Pages and Documents

Modified: trunk/Source/WebCore/rendering/BreakLines.cpp (232102 => 232103)


--- trunk/Source/WebCore/rendering/BreakLines.cpp	2018-05-23 03:19:20 UTC (rev 232102)
+++ trunk/Source/WebCore/rendering/BreakLines.cpp	2018-05-23 03:47:54 UTC (rev 232103)
@@ -64,7 +64,7 @@
     { B(0, 0, 0, 0, 0, 0, 0, 1), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 1, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 1, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 1, 0, 0, 0, 0, 0) }, // *
     { B(0, 0, 0, 0, 0, 0, 0, 1), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 1, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 1, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 1, 0, 0, 0, 0, 0) }, // +
     { B(0, 0, 0, 0, 0, 0, 0, 1), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 1, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 1, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 1, 0, 0, 0, 0, 0) }, // ,
-    { B(1, 1, 1, 1, 1, 1, 1, 1), B(1, 1, 1, 1, 1, 0, 1, 0), 0, B(0, 1, 1, 1, 1, 1, 1, 1), F, F, F, B(1, 1, 1, 1, 1, 1, 1, 1), F, F, F, B(1, 1, 1, 1, 1, 1, 1, 1) }, // - Note: breaking before '0'-'9' is handled hard-coded in shouldBreakAfter().
+    { B(1, 1, 1, 1, 1, 1, 1, 1), B(1, 1, 1, 0, 1, 0, 1, 0), 0, B(0, 1, 1, 1, 1, 1, 1, 1), F, F, F, B(1, 1, 1, 1, 1, 1, 1, 1), F, F, F, B(1, 1, 1, 1, 1, 1, 1, 1) }, // - Note: breaking before '0'-'9' is handled hard-coded in shouldBreakAfter().
     { B(0, 0, 0, 0, 0, 0, 0, 1), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 1, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 1, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 1, 0, 0, 0, 0, 0) }, // .
     { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // /
     DI,  DI,  DI,  DI,  DI,  DI,  DI,  DI,  DI,  DI, // 0-9
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to