Changeset 176531 in webkit

Timestamp:

Nov 24, 2014, 5:00:57 PM (12 years ago)

Author:

Alan Bujtas

Message:

Simple line layout: Rename TextFragment::mustBreak to TextFragment::isLineBreak
​https://bugs.webkit.org/show_bug.cgi?id=139035

Reviewed by Antti Koivisto.

Move new line logic to FlowContents class.
This is in preparation to support <br>.

No change in functionality.

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::TextFragment::TextFragment):
(WebCore::SimpleLineLayout::removeTrailingWhitespace):
(WebCore::SimpleLineLayout::nextFragment):
(WebCore::SimpleLineLayout::createLineRuns):

• rendering/SimpleLineLayoutFlowContents.h:

(WebCore::SimpleLineLayout::FlowContents::isNewline):
(WebCore::SimpleLineLayout::FlowContents::isNewlineCharacter): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SimpleLineLayout.cpp (modified) (9 diffs)
• rendering/SimpleLineLayoutFlowContents.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-24  Zalan Bujtas  <zalan@apple.com>
+
+        Simple line layout: Rename TextFragment::mustBreak to TextFragment::isLineBreak
+        https://bugs.webkit.org/show_bug.cgi?id=139035
+
+        Reviewed by Antti Koivisto.
+
+        Move new line logic to FlowContents class.
+        This is in preparation to support <br>.
+
+        No change in functionality.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::TextFragment::TextFragment):
+        (WebCore::SimpleLineLayout::removeTrailingWhitespace):
+        (WebCore::SimpleLineLayout::nextFragment):
+        (WebCore::SimpleLineLayout::createLineRuns):
+        * rendering/SimpleLineLayoutFlowContents.h:
+        (WebCore::SimpleLineLayout::FlowContents::isNewline):
+        (WebCore::SimpleLineLayout::FlowContents::isNewlineCharacter): Deleted.
+
 2014-11-24  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -227 +227 @@
         , isWhitespaceOnly(false)
         , isBreakable(false)
-        , mustBreak(false)
+        , isLineBreak(false)
         , width(0)
     {
@@ -238 +238 @@
         , isWhitespaceOnly(isWhitespaceOnly)
         , isBreakable(false)
-        , mustBreak(false)
+        , isLineBreak(false)
         , width(textWidth)
     {
@@ -253 +253 @@
     bool isWhitespaceOnly : 1;
     bool isBreakable;
-    bool mustBreak;
+    bool isLineBreak;
     float width;
 };
@@ -390 +390 @@
 
     // If we skipped any whitespace and now the line end is a "preserved" newline, skip the newline too as we are wrapping the line here already.
-    if (lastPosition != lineState.position && style.preserveNewline && !flowContents.isEnd(lineState.position) && flowContents.isNewlineCharacter(lineState.position))
+    if (lastPosition != lineState.position && style.preserveNewline && !flowContents.isEnd(lineState.position) && flowContents.isLineBreak(lineState.position))
         ++lineState.position;
 }
@@ -460 +460 @@
     const auto& style = flowContents.style();
     TextFragment fragment;
-    fragment.mustBreak = style.preserveNewline && flowContents.isNewlineCharacter(previousFragmentEnd);
+    fragment.isLineBreak = flowContents.isLineBreak(previousFragmentEnd);
     unsigned spaceCount = 0;
     unsigned whitespaceEnd = previousFragmentEnd;
-    if (!fragment.mustBreak)
+    if (!fragment.isLineBreak)
         whitespaceEnd = flowContents.findNextNonWhitespacePosition(previousFragmentEnd, spaceCount);
     fragment.isWhitespaceOnly = previousFragmentEnd < whitespaceEnd;
@@ -469 +469 @@
     if (fragment.isWhitespaceOnly)
         fragment.end = whitespaceEnd;
-    else if (fragment.mustBreak)
+    else if (fragment.isLineBreak)
         fragment.end = fragment.start + 1;
     else
@@ -482 +482 @@
     if (fragment.isCollapsedWhitespace)
         fragment.width = style.spaceWidth;
-    else if (fragment.mustBreak)
+    else if (fragment.isLineBreak)
         fragment.width = 0; // Newline character's width is 0.
     else if (fragmentLength == spaceCount) // Space only.
@@ -498 +498 @@
         // Find the next text fragment. Start from the end of the previous fragment -current line end.
         TextFragment fragment = nextFragment(lineState.position, flowContents, lineState.width());
-        if ((lineCanBeWrapped && !lineState.fits(fragment.width)) || fragment.mustBreak) {
+        if ((lineCanBeWrapped && !lineState.fits(fragment.width)) || fragment.isLineBreak) {
             // Overflow wrapping behaviour:
             // 1. Newline character: wraps the line unless it's treated as whitespace.
@@ -506 +506 @@
             // 5. Non-whitespace fragment when there's already another fragment on the line gets pushed to the next line.
             bool isFirstFragment = !lineState.width();
-            if (fragment.mustBreak) {
+            if (fragment.isLineBreak) {
                 if (isFirstFragment)
                     lineState.addUncommitted(fragment);

trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h

@@ -46 +46 @@
     float textWidth(unsigned from, unsigned to, float xPosition) const;
 
-    bool isNewlineCharacter(unsigned position) const;
+    bool isLineBreak(unsigned position) const;
     bool isEnd(unsigned position) const;
 
@@ -96 +96 @@
 }
 
-inline bool FlowContents::isNewlineCharacter(unsigned position) const
+inline bool FlowContents::isLineBreak(unsigned position) const
 {
-    return characterAt(position) == '\n';
+    return m_style.preserveNewline && characterAt(position) == '\n';
 }