Changeset 176507 in webkit

Timestamp:

Nov 22, 2014, 11:37:08 AM (10 years ago)

Author:

Antti Koivisto

Message:

Make locale part of the SimpleLineLayout::FlowContent::Style
​https://bugs.webkit.org/show_bug.cgi?id=139004

Reviewed by Zalan Bujtas.

That's the only part of style not extracted out of RenderStyle in the constructor.

• rendering/SimpleLineLayoutFlowContents.cpp:

(WebCore::SimpleLineLayout::FlowContents::Style::Style):
(WebCore::SimpleLineLayout::FlowContents::FlowContents):
(WebCore::SimpleLineLayout::FlowContents::appendNextRendererContentIfNeeded):

• rendering/SimpleLineLayoutFlowContents.h:

Also remove RenderBlockFlow member since it is now unused.

(WebCore::SimpleLineLayout::FlowContents::Style::Style): Deleted.

Move to cpp.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-22  Antti Koivisto  <antti@apple.com>
+
+        Make locale part of the SimpleLineLayout::FlowContent::Style
+        https://bugs.webkit.org/show_bug.cgi?id=139004
+
+        Reviewed by Zalan Bujtas.
+
+        That's the only part of style not extracted out of RenderStyle in the constructor.
+
+        * rendering/SimpleLineLayoutFlowContents.cpp:
+        (WebCore::SimpleLineLayout::FlowContents::Style::Style):
+        (WebCore::SimpleLineLayout::FlowContents::FlowContents):
+        (WebCore::SimpleLineLayout::FlowContents::appendNextRendererContentIfNeeded):
+        * rendering/SimpleLineLayoutFlowContents.h:
+
+            Also remove RenderBlockFlow member since it is now unused.
+
+        (WebCore::SimpleLineLayout::FlowContents::Style::Style): Deleted.
+
+            Move to cpp.
+
 2014-11-22  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp

@@ -34 +34 @@
 namespace SimpleLineLayout {
 
+FlowContents::Style::Style(const RenderStyle& style)
+    : font(style.font())
+    , textAlign(style.textAlign())
+    , collapseWhitespace(style.collapseWhiteSpace())
+    , preserveNewline(style.preserveNewline())
+    , wrapLines(style.autoWrap())
+    , breakWordOnOverflow(style.overflowWrap() == BreakOverflowWrap && (wrapLines || preserveNewline))
+    , spaceWidth(font.width(TextRun(&space, 1)))
+    , tabWidth(collapseWhitespace ? 0 : style.tabSize())
+    , locale(style.locale())
+{
+}
+
 FlowContents::FlowContents(const RenderBlockFlow& flow)
-    : m_flow(flow)
-    , m_style(flow.style())
+    : m_style(flow.style())
     , m_lineBreakIterator(downcast<RenderText>(*flow.firstChild()).text(), flow.style().locale())
     , m_lastRendererIndex(0)
 {
     unsigned startPosition = 0;
-    for (const RenderText* textRenderer = downcast<RenderText>(m_flow.firstChild()); textRenderer; textRenderer = downcast<RenderText>(textRenderer->nextSibling())) {
-        unsigned contentLength = textRenderer->text()->length();
-        m_textRanges.append(std::make_pair(startPosition, textRenderer));
+    for (auto& textChild : childrenOfType<RenderText>(flow)) {
+        unsigned contentLength = textChild.text()->length();
+        m_textRanges.append(std::make_pair(startPosition, &textChild));
         startPosition += contentLength;
     }
@@ -158 +170 @@
 
     ++m_lastRendererIndex;
-    m_lineBreakIterator.resetStringAndReleaseIterator(string + String(nextRenderer->text()), m_flow.style().locale(), LineBreakIteratorModeUAX14);
+    m_lineBreakIterator.resetStringAndReleaseIterator(string + String(nextRenderer->text()), m_style.locale, LineBreakIteratorModeUAX14);
     return true;
 }

trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h

@@ -52 +52 @@
     const RenderText* renderer(unsigned position, unsigned* startPosition = nullptr) const;
 
-    class Style {
-    public:
-        Style(const RenderStyle& style)
-            : font(style.font())
-            , textAlign(style.textAlign())
-            , collapseWhitespace(style.collapseWhiteSpace())
-            , preserveNewline(style.preserveNewline())
-            , wrapLines(style.autoWrap())
-            , breakWordOnOverflow(style.overflowWrap() == BreakOverflowWrap && (wrapLines || preserveNewline))
-            , spaceWidth(font.width(TextRun(&space, 1)))
-            , tabWidth(collapseWhitespace ? 0 : style.tabSize())
-        {
-        }
+    struct Style {
+        explicit Style(const RenderStyle&);
 
         const Font& font;
@@ -74 +63 @@
         float spaceWidth;
         unsigned tabWidth;
+        AtomicString locale;
     };
     const Style& style() const { return m_style; }
@@ -82 +72 @@
     float runWidth(const RenderText&, unsigned from, unsigned to, float xPosition) const;
 
-    const RenderBlockFlow& m_flow;
     const Style m_style;
     mutable LazyLineBreakIterator m_lineBreakIterator;