Changeset 211680 in webkit

Timestamp:

Feb 5, 2017, 6:41:10 AM (9 years ago)

Author:

Alan Bujtas

Message:

Simple line layout: Bail out from Simple Line Layout on surrogate pairs.
​https://bugs.webkit.org/show_bug.cgi?id=167840
<rdar://problem/30364784>

Reviewed by Myles C. Maxfield.

Source/WebCore:

Surrogate pairs require special line breaking logic.

Test: fast/text/simple-line-layout-no-surrogate-pairs.html

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseForCharacter):
(WebCore::SimpleLineLayout::canUseForText): Checking against special characters is faster than
checking against glyphs. Reverse their order.
(WebCore::SimpleLineLayout::printReason):

LayoutTests:

• fast/text/simple-line-layout-no-surrogate-pairs-expected.html: Added.
• fast/text/simple-line-layout-no-surrogate-pairs.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs-expected.html (added)
• LayoutTests/fast/text/simple-line-layout-no-surrogate-pairs.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/SimpleLineLayout.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-02-05  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Bail out from Simple Line Layout on surrogate pairs.
+        https://bugs.webkit.org/show_bug.cgi?id=167840
+        <rdar://problem/30364784>
+
+        Reviewed by Myles C. Maxfield.
+
+        * fast/text/simple-line-layout-no-surrogate-pairs-expected.html: Added.
+        * fast/text/simple-line-layout-no-surrogate-pairs.html: Added.
+
 2017-02-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-05  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Bail out from Simple Line Layout on surrogate pairs.
+        https://bugs.webkit.org/show_bug.cgi?id=167840
+        <rdar://problem/30364784>
+
+        Reviewed by Myles C. Maxfield.
+
+        Surrogate pairs require special line breaking logic. 
+
+        Test: fast/text/simple-line-layout-no-surrogate-pairs.html
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseForCharacter):
+        (WebCore::SimpleLineLayout::canUseForText): Checking against special characters is faster than
+        checking against glyphs. Reverse their order. 
+        (WebCore::SimpleLineLayout::printReason):
+
 2017-02-04  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -114 +114 @@
     FlowHasHangingPunctuation             = 1LLU  << 48,
     FlowFontHasOverflowGlyph              = 1LLU  << 49,
-    EndOfReasons                          = 1LLU  << 50
+    FlowTextHasSurrogatePair              = 1LLU  << 50,
+    EndOfReasons                          = 1LLU  << 51
 };
 const unsigned NoReason = 0;
@@ -151 +152 @@
     }
 
+    if (U16_IS_SURROGATE(character))
+        SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasSurrogatePair, reasons, includeReasons);
+    
     UCharDirection direction = u_charDirection(character);
     if (direction == U_RIGHT_TO_LEFT || direction == U_RIGHT_TO_LEFT_ARABIC
@@ -180 +184 @@
             SET_REASON_AND_RETURN_IF_NEEDED(FlowTextHasSoftHyphen, reasons, includeReasons);
 
+        auto characterReasons = canUseForCharacter(character, textIsJustified, includeReasons);
+        if (characterReasons != NoReason)
+            SET_REASON_AND_RETURN_IF_NEEDED(characterReasons, reasons, includeReasons);
+
         auto glyphData = fontCascade.glyphDataForCharacter(character, false);
         if (!glyphData.isValid() || glyphData.font != &primaryFont)
@@ -186 +194 @@
         if (lineHeightConstraint && primaryFont.boundsForGlyph(glyphData.glyph).height() > *lineHeightConstraint)
             SET_REASON_AND_RETURN_IF_NEEDED(FlowFontHasOverflowGlyph, reasons, includeReasons);
-
-        auto characterReasons = canUseForCharacter(character, textIsJustified, includeReasons);
-        if (characterReasons != NoReason)
-            SET_REASON_AND_RETURN_IF_NEEDED(characterReasons, reasons, includeReasons);
     }
     return reasons;
@@ -1081 +1085 @@
         stream << "-webkit-line-box-contain: glyphs with overflowing text.";
         break;
+    case FlowTextHasSurrogatePair:
+        stream << "surrogate pair";
+        break;
     case FlowTextIsEmpty:
     case FlowHasNoChild: