Changeset 158214 in webkit

Timestamp:

Oct 29, 2013 1:25:44 PM (10 years ago)

Author:

Antti Koivisto

Message:

Make SimpleLineLayout::Layout a variable size object
​https://bugs.webkit.org/show_bug.cgi?id=123459

Reviewed by Andreas Kling.

Less memory, less indirection.

• rendering/SimpleLineLayout.cpp:

(WebCore::SimpleLineLayout::canUseFor):
(WebCore::SimpleLineLayout::create):
(WebCore::SimpleLineLayout::Layout::create):
(WebCore::SimpleLineLayout::Layout::Layout):

• rendering/SimpleLineLayout.h:
• rendering/SimpleLineLayoutFunctions.cpp:

(WebCore::SimpleLineLayout::hitTestFlow):

• rendering/SimpleLineLayoutFunctions.h:

(WebCore::SimpleLineLayout::computeFlowFirstLineBaseline):
(WebCore::SimpleLineLayout::computeFlowLastLineBaseline):
(WebCore::SimpleLineLayout::findTextCaretMinimumOffset):
(WebCore::SimpleLineLayout::findTextCaretMaximumOffset):
(WebCore::SimpleLineLayout::containsTextCaretOffset):
(WebCore::SimpleLineLayout::isTextRendered):

• rendering/SimpleLineLayoutResolver.h:

(WebCore::SimpleLineLayout::RunResolver::end):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SimpleLineLayout.cpp (modified) (3 diffs)
• rendering/SimpleLineLayout.h (modified) (3 diffs)
• rendering/SimpleLineLayoutFunctions.cpp (modified) (1 diff)
• rendering/SimpleLineLayoutFunctions.h (modified) (5 diffs)
• rendering/SimpleLineLayoutResolver.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-29  Antti Koivisto  <antti@apple.com>
+
+        Make SimpleLineLayout::Layout a variable size object
+        https://bugs.webkit.org/show_bug.cgi?id=123459
+
+        Reviewed by Andreas Kling.
+
+        Less memory, less indirection.
+
+        * rendering/SimpleLineLayout.cpp:
+        (WebCore::SimpleLineLayout::canUseFor):
+        (WebCore::SimpleLineLayout::create):
+        (WebCore::SimpleLineLayout::Layout::create):
+        (WebCore::SimpleLineLayout::Layout::Layout):
+        * rendering/SimpleLineLayout.h:
+        * rendering/SimpleLineLayoutFunctions.cpp:
+        (WebCore::SimpleLineLayout::hitTestFlow):
+        * rendering/SimpleLineLayoutFunctions.h:
+        (WebCore::SimpleLineLayout::computeFlowFirstLineBaseline):
+        (WebCore::SimpleLineLayout::computeFlowLastLineBaseline):
+        (WebCore::SimpleLineLayout::findTextCaretMinimumOffset):
+        (WebCore::SimpleLineLayout::findTextCaretMaximumOffset):
+        (WebCore::SimpleLineLayout::containsTextCaretOffset):
+        (WebCore::SimpleLineLayout::isTextRendered):
+        * rendering/SimpleLineLayoutResolver.h:
+        (WebCore::SimpleLineLayout::RunResolver::end):
+
 2013-10-29  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/SimpleLineLayout.cpp

@@ -237 +237 @@
 std::unique_ptr<Layout> create(RenderBlockFlow& flow)
 {
-    auto layout = std::make_unique<Layout>();
-
     RenderText& textRenderer = toRenderText(*flow.firstChild());
     ASSERT(!textRenderer.firstTextBox());
@@ -250 +248 @@
     LazyLineBreakIterator lineBreakIterator(textRenderer.text(), style.locale());
     int nextBreakable = -1;
+
+    Layout::RunVector runs;
+    unsigned lineCount = 0;
 
     unsigned lineEndOffset = 0;
@@ -319 +320 @@
 
         for (unsigned i = 0; i < lineRuns.size(); ++i)
-            layout->runs.append(lineRuns[i]);
-
-        layout->runs.last().isEndOfLine = true;
-        layout->lineCount++;
+            runs.append(lineRuns[i]);
+
+        runs.last().isEndOfLine = true;
+        ++lineCount;
     }
 
     textRenderer.clearNeedsLayout();
 
-    layout->runs.shrinkToFit();
-    return layout;
-}
-
-}
-}
+    return Layout::create(runs, lineCount);
+}
+
+std::unique_ptr<Layout> Layout::create(const RunVector& runVector, unsigned lineCount)
+{
+    void* slot = WTF::fastMalloc(sizeof(Layout) + sizeof(Run) * runVector.size());
+    return std::unique_ptr<Layout>(new (NotNull, slot) Layout(runVector, lineCount));
+}
+
+Layout::Layout(const RunVector& runVector, unsigned lineCount)
+    : runCount(runVector.size())
+    , lineCount(lineCount)
+{
+    memcpy(runs, runVector.data(), runCount * sizeof(Run));
+}
+
+}
+}

trunk/Source/WebCore/rendering/SimpleLineLayout.h

@@ -30 +30 @@
 #include <wtf/text/WTFString.h>
 
+#if COMPILER(MSVC)
+#pragma warning(push)
+#pragma warning(disable: 4200) // Disable "zero-sized array in struct/union" warning
+#endif
+
 namespace WebCore {
 
@@ -55 +60 @@
 
 struct Layout {
-    Layout() : lineCount(0) { }
+    typedef Vector<Run, 10> RunVector;
+    static std::unique_ptr<Layout> create(const RunVector&, unsigned lineCount);
 
+    unsigned runCount;
     unsigned lineCount;
-    Vector<Run> runs;
+    Run runs[0];
+
+private:
+    Layout(const RunVector&, unsigned lineCount);
 };
 
@@ -66 +76 @@
 }
 
+#if COMPILER(MSVC)
+#pragma warning(pop)
 #endif
+
+#endif

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp

@@ -75 +75 @@
         return false;
 
-    if (layout.runs.isEmpty())
+    if (!layout.runCount)
         return false;
 

trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h

@@ -71 +71 @@
 inline LayoutUnit computeFlowFirstLineBaseline(const RenderBlockFlow& flow, const Layout& layout)
 {
-    ASSERT_UNUSED(layout, !layout.runs.isEmpty());
+    ASSERT_UNUSED(layout, layout.runCount);
     return flow.borderAndPaddingBefore() + baselineFromFlow(flow);
 }
@@ -77 +77 @@
 inline LayoutUnit computeFlowLastLineBaseline(const RenderBlockFlow& flow, const Layout& layout)
 {
-    ASSERT(!layout.runs.isEmpty());
-    return flow.borderAndPaddingBefore() + lineHeightFromFlow(flow) * (layout.runs.size() - 1) + baselineFromFlow(flow);
+    ASSERT(layout.runCount);
+    return flow.borderAndPaddingBefore() + lineHeightFromFlow(flow) * (layout.runCount - 1) + baselineFromFlow(flow);
 }
 
 inline unsigned findTextCaretMinimumOffset(const RenderText&, const Layout& layout)
 {
-    if (layout.runs.isEmpty())
+    if (!layout.runCount)
         return 0;
     return layout.runs[0].textOffset;
@@ -90 +90 @@
 inline unsigned findTextCaretMaximumOffset(const RenderText& renderer, const Layout& layout)
 {
-    if (layout.runs.isEmpty())
+    if (!layout.runCount)
         return renderer.textLength();
-    auto& last = layout.runs[layout.runs.size() - 1];
+    auto& last = layout.runs[layout.runCount - 1];
     return last.textOffset + last.textLength;
 }
@@ -98 +98 @@
 inline bool containsTextCaretOffset(const RenderText&, const Layout& layout, unsigned offset)
 {
-    for (unsigned i = 0; i < layout.runs.size(); ++i) {
+    for (unsigned i = 0; i < layout.runCount; ++i) {
         auto& line = layout.runs[i];
         if (offset < line.textOffset)
@@ -110 +110 @@
 inline bool isTextRendered(const RenderText&, const Layout& layout)
 {
-    for (unsigned i = 0; i < layout.runs.size(); ++i) {
+    for (unsigned i = 0; i < layout.runCount; ++i) {
         if (layout.runs[i].textLength)
             return true;

trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h

@@ -211 +211 @@
 inline RunResolver::Iterator RunResolver::end() const
 {
-    return Iterator(*this, m_layout.runs.size());
+    return Iterator(*this, m_layout.runCount);
 }