Changeset 83038 in webkit

Timestamp:

Apr 6, 2011 5:12:58 AM (13 years ago)

Author:

leviw@chromium.org

Message:

2011-04-06 Levi Weintraub <​leviw@chromium.org>

Reviewed by Ryosuke Niwa.

Add member functions for determining line/paragraph separation to InlineIterator
​https://bugs.webkit.org/show_bug.cgi?id=57938

Adding atTextParagraphSeparator and atParagraphSeparator inline convenience functions to
InlineIterator, where it makes far more sense for them to be. Also moving
shouldPreserveNewline to RenderObject and renaming it preservesNewline.

No new tests as this provides no new functionality.

• rendering/InlineIterator.h: (WebCore::InlineIterator::atTextParagraphSeparator): (WebCore::InlineIterator::atParagraphSeparator):
• rendering/RenderBlockLineLayout.cpp: (WebCore::RenderBlock::requiresLineBox): (WebCore::RenderBlock::findNextLineBreak):
• rendering/RenderObject.h: (WebCore::RenderObject::preservesNewline):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineIterator.h (modified) (1 diff)
• rendering/RenderBlockLineLayout.cpp (modified) (4 diffs)
• rendering/RenderObject.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-06  Levi Weintraub  <leviw@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        Add member functions for determining line/paragraph separation to InlineIterator
+        https://bugs.webkit.org/show_bug.cgi?id=57938
+
+        Adding atTextParagraphSeparator and atParagraphSeparator inline convenience functions to
+        InlineIterator, where it makes far more sense for them to be. Also moving
+        shouldPreserveNewline to RenderObject and renaming it preservesNewline.
+
+        No new tests as this provides no new functionality.
+
+        * rendering/InlineIterator.h:
+        (WebCore::InlineIterator::atTextParagraphSeparator):
+        (WebCore::InlineIterator::atParagraphSeparator):
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::requiresLineBox):
+        (WebCore::RenderBlock::findNextLineBreak):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::preservesNewline):
+
 2011-04-05  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/Source/WebCore/rendering/InlineIterator.h

@@ -68 +68 @@
     void increment(InlineBidiResolver* = 0);
     bool atEnd() const;
+
+    inline bool atTextParagraphSeparator()
+    {
+        return m_obj && m_obj->preservesNewline() && m_obj->isText() && toRenderText(m_obj)->textLength()
+            && !toRenderText(m_obj)->isWordBreak() && toRenderText(m_obj)->characters()[m_pos] == '\n';
+    }
+    
+    inline bool atParagraphSeparator()
+    {
+        return (m_obj && m_obj->isBR()) || atTextParagraphSeparator();
+    }
 
     UChar current() const;

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -1389 +1389 @@
 }
 
-static inline bool shouldPreserveNewline(RenderObject* object)
-{
-#if ENABLE(SVG)
-    if (object->isSVGInlineText())
-        return false;
-#endif
-
-    return object->style()->preserveNewline();
-}
-
 static bool inlineFlowRequiresLineBox(RenderInline* flow)
 {
@@ -1419 +1409 @@
 
     UChar current = it.current();
-    return current != ' ' && current != '\t' && current != softHyphen && (current != '\n' || shouldPreserveNewline(it.m_obj)) 
+    return current != ' ' && current != '\t' && current != softHyphen && (current != '\n' || it.m_obj->preservesNewline()) 
             && !skipNonBreakingSpace(it, isLineEmpty, previousLineBrokeCleanly);
 }
@@ -1915 +1905 @@
                                     goto end;
                             }
-                            if (lBreak.m_obj && shouldPreserveNewline(lBreak.m_obj) && lBreak.m_obj->isText() && toRenderText(lBreak.m_obj)->textLength() && !toRenderText(lBreak.m_obj)->isWordBreak() && toRenderText(lBreak.m_obj)->characters()[lBreak.m_pos] == '\n') {
+                            if (lBreak.atTextParagraphSeparator()) {
                                 if (!stoppedIgnoringSpaces && pos > 0) {
                                     // We need to stop right before the newline and then start up again.
@@ -2056 +2046 @@
                     if (nextText->textLength()) {
                         UChar c = nextText->characters()[0];
-                        if (c == ' ' || c == '\t' || (c == '\n' && !shouldPreserveNewline(next)))
+                        if (c == ' ' || c == '\t' || (c == '\n' && !next->preservesNewline()))
                             // If the next item on the line is text, and if we did not end with
                             // a space, then the next text run continues our word (and so it needs to

trunk/Source/WebCore/rendering/RenderObject.h

@@ -434 +434 @@
     bool hasMask() const { return style() && style()->hasMask(); }
 
+    inline bool preservesNewline() const;
     void drawLineForBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, BoxSide,
                             Color, EBorderStyle, int adjbw1, int adjbw2);
@@ -1038 +1039 @@
 }
 
+inline bool RenderObject::preservesNewline() const
+{
+#if ENABLE(SVG)
+    if (isSVGInlineText())
+        return false;
+#endif
+        
+    return style()->preserveNewline();
+}
+
 inline void makeMatrixRenderable(TransformationMatrix& matrix, bool has3DRendering)
 {