Changeset 211222 in webkit

Timestamp:

Jan 26, 2017 11:36:27 AM (7 years ago)

Author:

Alan Bujtas

Message:

Simple line layout: Add support for -webkit-hyphenate-limit-after and -webkit-hyphenate-limit-before
​https://bugs.webkit.org/show_bug.cgi?id=167439
<rdar://problem/30180184>

Reviewed by Antti Koivisto.

Source/WebCore:

Implement pre and post hyphen length constrains for simple line layout.

Tests: fast/text/simple-line-layout-hyphen-limit-after.html

fast/text/simple-line-layout-hyphen-limit-before.html

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseForStyle):
(WebCore::SimpleLineLayout::printReason):

• rendering/SimpleLineLayoutTextFragmentIterator.cpp:

(WebCore::SimpleLineLayout::TextFragmentIterator::Style::Style): Same as normal line layout default values.
(WebCore::SimpleLineLayout::TextFragmentIterator::lastHyphenPosition):

• rendering/SimpleLineLayoutTextFragmentIterator.h:

LayoutTests:

• fast/text/simple-line-layout-hyphen-limit-after.html: Added.
• fast/text/simple-line-layout-hyphen-limit-before-expected.html: Added.
• fast/text/simple-line-layout-hyphen-limit-before.html: Added.
• platform/mac/fast/text/hyphenate-limit-before-after-expected.txt: progression.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/simple-line-layout-hyphen-limit-after-expected.html (added)
• LayoutTests/fast/text/simple-line-layout-hyphen-limit-after.html (added)
• LayoutTests/fast/text/simple-line-layout-hyphen-limit-before-expected.html (added)
• LayoutTests/fast/text/simple-line-layout-hyphen-limit-before.html (added)
• LayoutTests/platform/mac/fast/text/hyphenate-limit-before-after-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayout.cpp (modified) (3 diffs)
• Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (modified) (2 diffs)
• Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-01-26  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Add support for -webkit-hyphenate-limit-after and -webkit-hyphenate-limit-before
+        https://bugs.webkit.org/show_bug.cgi?id=167439
+        <rdar://problem/30180184>
+
+        Reviewed by Antti Koivisto.
+
+        * fast/text/simple-line-layout-hyphen-limit-after.html: Added.
+        * fast/text/simple-line-layout-hyphen-limit-before-expected.html: Added.
+        * fast/text/simple-line-layout-hyphen-limit-before.html: Added.
+        * platform/mac/fast/text/hyphenate-limit-before-after-expected.txt: progression.
+
 2017-01-26  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/platform/mac/fast/text/hyphenate-limit-before-after-expected.txt

@@ -54 +54 @@
         text run at (434,123) width 4: " "
       RenderBlock {DIV} at (446,84) size 126x60 [border: (3px solid #000000)]
-        RenderText {#text} at (3,3) size 74x54
+        RenderText {#text} at (3,3) size 89x54
           text run at (3,3) width 74: "There is re" + hyphen string "-"
-          text run at (3,21) width 60: "markable"
-          text run at (3,39) width 61: "evidence."
+          text run at (3,21) width 89: "markable evi" + hyphen string "-"
+          text run at (3,39) width 42: "dence."
       RenderText {#text} at (580,123) size 4x18
         text run at (580,123) width 4: " "
       RenderBlock {DIV} at (592,84) size 126x60 [border: (3px solid #000000)]
-        RenderText {#text} at (3,3) size 72x54
+        RenderText {#text} at (3,3) size 101x54
           text run at (3,3) width 52: "There is"
-          text run at (3,21) width 72: "remarkable"
-          text run at (3,39) width 61: "evidence."
+          text run at (3,21) width 101: "remarkable evi" + hyphen string "-"
+          text run at (3,39) width 42: "dence."
       RenderText {#text} at (0,0) size 0x0

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-26  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Add support for -webkit-hyphenate-limit-after and -webkit-hyphenate-limit-before
+        https://bugs.webkit.org/show_bug.cgi?id=167439
+        <rdar://problem/30180184>
+
+        Reviewed by Antti Koivisto.
+
+        Implement pre and post hyphen length constrains for simple line layout.
+
+        Tests: fast/text/simple-line-layout-hyphen-limit-after.html
+               fast/text/simple-line-layout-hyphen-limit-before.html
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseForStyle):
+        (WebCore::SimpleLineLayout::printReason):
+        * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+        (WebCore::SimpleLineLayout::TextFragmentIterator::Style::Style): Same as normal line layout default values.
+        (WebCore::SimpleLineLayout::TextFragmentIterator::lastHyphenPosition):
+        * rendering/SimpleLineLayoutTextFragmentIterator.h:
+
 2017-01-26  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -87 +87 @@
     FlowHasLineAlignEdges                 = 1LLU  << 21,
     FlowHasLineSnap                       = 1LLU  << 22,
-    FlowHasHypensLimit                    = 1LLU  << 23,
+    FlowHasHypensLineLimit                = 1LLU  << 23,
     FlowHasTextEmphasisFillOrMark         = 1LLU  << 24,
     FlowHasTextShadow                     = 1LLU  << 25,
@@ -238 +238 @@
     if (style.lineSnap() != LineSnapNone)
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasLineSnap, reasons, includeReasons);
-    if (style.hyphenationLimitBefore() != RenderStyle::initialHyphenationLimitBefore()
-        || style.hyphenationLimitAfter() != RenderStyle::initialHyphenationLimitAfter()
-        || style.hyphenationLimitLines() != RenderStyle::initialHyphenationLimitLines())
-        SET_REASON_AND_RETURN_IF_NEEDED(FlowHasHypensLimit, reasons, includeReasons);
+    if (style.hyphenationLimitLines() != RenderStyle::initialHyphenationLimitLines())
+        SET_REASON_AND_RETURN_IF_NEEDED(FlowHasHypensLineLimit, reasons, includeReasons);
     if (style.textEmphasisFill() != TextEmphasisFillFilled || style.textEmphasisMark() != TextEmphasisMarkNone)
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasTextEmphasisFillOrMark, reasons, includeReasons);
@@ -992 +990 @@
         stream << "-webkit-line-snap property";
         break;
-    case FlowHasHypensLimit:
-        stream << "hyphen-limit-* property";
+    case FlowHasHypensLineLimit:
+        stream << "-webkit-hyphenate-limit-lines property";
         break;
     case FlowHasTextEmphasisFillOrMark:

trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp

@@ -50 +50 @@
     , shouldHyphenate(style.hyphens() == HyphensAuto && canHyphenate(style.locale()))
     , hyphenStringWidth(shouldHyphenate ? font.width(TextRun(style.hyphenString())) : 0)
+    , hyphenLimitBefore(style.hyphenationLimitBefore() < 0 ? 2 : style.hyphenationLimitBefore())
+    , hyphenLimitAfter(style.hyphenationLimitAfter() < 0 ? 2 : style.hyphenationLimitAfter())
     , locale(style.locale())
 {
@@ -177 +179 @@
 }
 
-std::optional<unsigned> TextFragmentIterator::lastHyphenPosition(const TextFragmentIterator::TextFragment& run, unsigned beforeIndex) const
-{
-    ASSERT(run.start() < beforeIndex);
+std::optional<unsigned> TextFragmentIterator::lastHyphenPosition(const TextFragmentIterator::TextFragment& run, unsigned before) const
+{
+    ASSERT(run.start() < before);
     auto& segment = *m_currentSegment;
-    ASSERT(segment.start <= beforeIndex && beforeIndex <= segment.end);
+    ASSERT(segment.start <= before && before <= segment.end);
     ASSERT(is<RenderText>(segment.renderer));
     if (!m_style.shouldHyphenate || run.type() != TextFragment::NonWhitespace)
         return std::nullopt;
-    
+    // Check if there are enough characters in the run.
+    unsigned runLength = run.end() - run.start();
+    if (m_style.hyphenLimitBefore >= runLength || m_style.hyphenLimitAfter >= runLength || m_style.hyphenLimitBefore + m_style.hyphenLimitAfter > runLength)
+        return std::nullopt;
     auto runStart = segment.toSegmentPosition(run.start());
-    auto before = segment.toSegmentPosition(beforeIndex) - runStart;
+    auto beforeIndex = segment.toSegmentPosition(before) - runStart;
+    if (beforeIndex <= m_style.hyphenLimitBefore)
+        return std::nullopt;
+    // Adjust before index to accommodate the limit-after value (this is the last potential hyphen location).
+    beforeIndex = std::min(beforeIndex, runLength - m_style.hyphenLimitAfter + 1);
     auto substringForHyphenation = StringView(segment.text).substring(runStart, run.end() - run.start());
-    auto hyphenLocation = lastHyphenLocation(substringForHyphenation, before, m_style.locale);
-    if (hyphenLocation)
+    auto hyphenLocation = lastHyphenLocation(substringForHyphenation, beforeIndex, m_style.locale);
+    // Check if there are enough characters before and after the hyphen.
+    if (hyphenLocation && hyphenLocation >= m_style.hyphenLimitBefore && m_style.hyphenLimitAfter <= (runLength - hyphenLocation))
         return segment.toRenderPosition(hyphenLocation + runStart);
     return std::nullopt;

trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h

@@ -119 +119 @@
         bool shouldHyphenate;
         float hyphenStringWidth;
+        unsigned hyphenLimitBefore;
+        unsigned hyphenLimitAfter;
         AtomicString locale;
     };