Attachment 341061 Details for Bug 185899 – Patch

[patch] Patch

bug-185899-20180522193416.patch (text/plain), 4.37 KB, created by Myles C. Maxfield on 2018-05-22 19:34:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2018-05-22 19:34:16 PDT

Size: 4.37 KB

patch

obsolete

>Subversion Revision: 232097
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c95c6c50eafe14eedc09ae161d12f4742d9c854e..b9fc2e5589ea8763c1508a2008f05cb08fd61ed9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-05-22  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        Text can wrap between hyphens and commas
>+        https://bugs.webkit.org/show_bug.cgi?id=185899
>+        <rdar://problem/40118983>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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  Dean Jackson  <dino@apple.com>
> 
>         Optimized path zoom animation needs a valid UIImage and CGRect
>diff --git a/Source/WebCore/rendering/BreakLines.cpp b/Source/WebCore/rendering/BreakLines.cpp
>index 7e15990c7ed2a8b6a1090ff1a98bc9e053383268..9c339ce32c640262e628dc658378805fd5741548 100644
>--- a/Source/WebCore/rendering/BreakLines.cpp
>+++ b/Source/WebCore/rendering/BreakLines.cpp
>@@ -64,7 +64,7 @@ WEBCORE_EXPORT const unsigned char lineBreakTable[][lineBreakTableColumnCount] =
>     { 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
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index aa249cdccd0c3a0550123f815dfe5b61d986de2b..e1be0c8c01531b1cca1330c3953a52fe8f8d613c 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-05-22  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        Text can wrap between hyphens and commas
>+        https://bugs.webkit.org/show_bug.cgi?id=185899
>+        <rdar://problem/40118983>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * fast/text/line-break-hyphen-comma-expected.html: Added.
>+        * fast/text/line-break-hyphen-comma.html: Added.
>+
> 2018-05-22  David Fenton  <david_fenton@apple.com>
> 
>         Update test expectations for newly imported css-text layout tests
>diff --git a/LayoutTests/fast/text/line-break-hyphen-comma-expected.html b/LayoutTests/fast/text/line-break-hyphen-comma-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3a73b8c7c91501f6401b282b90b7914134aaf006
>--- /dev/null
>+++ b/LayoutTests/fast/text/line-break-hyphen-comma-expected.html
>@@ -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>
>diff --git a/LayoutTests/fast/text/line-break-hyphen-comma.html b/LayoutTests/fast/text/line-break-hyphen-comma.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..317c396abd8e9c87a21e90972d1df0dc94eba569
>--- /dev/null
>+++ b/LayoutTests/fast/text/line-break-hyphen-comma.html
>@@ -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>

Actions: View | Formatted Diff | Diff

Attachments on bug 185899: 341061