Attachment 339794 Details for Bug 185411 – Patch

[patch] Patch

bug-185411-20180507204412.patch (text/plain), 12.44 KB, created by zalan on 2018-05-07 20:44:13 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2018-05-07 20:44:13 PDT

Size: 12.44 KB

patch

obsolete

>Subversion Revision: 231371
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0ba10b34f9106c347d262918c00eac5d257f085d..fe8d7567b72e3b010168307af5965745ef9f61d5 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,37 @@
>+2018-05-07  Zalan Bujtas  <zalan@apple.com>
>+
>+        [Simple line layout] Cache run and line resolvers.
>+        https://bugs.webkit.org/show_bug.cgi?id=185411
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        WIP. EWS only.
>+
>+        Covered by existing tests.
>+
>+        * rendering/SimpleLineLayout.cpp:
>+        (WebCore::SimpleLineLayout::create):
>+        (WebCore::SimpleLineLayout::Layout::create):
>+        (WebCore::SimpleLineLayout::Layout::Layout):
>+        (WebCore::SimpleLineLayout::Layout::runResolver const):
>+        (WebCore::SimpleLineLayout::Layout::lineResolver const):
>+        * rendering/SimpleLineLayout.h:
>+        * rendering/SimpleLineLayoutFunctions.cpp:
>+        (WebCore::SimpleLineLayout::paintFlow):
>+        (WebCore::SimpleLineLayout::hitTestFlow):
>+        (WebCore::SimpleLineLayout::collectFlowOverflow):
>+        (WebCore::SimpleLineLayout::computeBoundingBox):
>+        (WebCore::SimpleLineLayout::computeFirstRunLocation):
>+        (WebCore::SimpleLineLayout::collectAbsoluteRects):
>+        (WebCore::SimpleLineLayout::collectAbsoluteQuads):
>+        (WebCore::SimpleLineLayout::textOffsetForPoint):
>+        (WebCore::SimpleLineLayout::collectAbsoluteQuadsForRange):
>+        (WebCore::SimpleLineLayout::generateLineBoxTree):
>+        * rendering/SimpleLineLayoutResolver.cpp:
>+        (WebCore::SimpleLineLayout::LineResolver::LineResolver):
>+        * rendering/SimpleLineLayoutResolver.h:
>+        (WebCore::SimpleLineLayout::lineResolver): Deleted.
>+
> 2018-05-04  Chris Dumez  <cdumez@apple.com>
> 
>         Unreviewed, rolling out r231331.
>diff --git a/Source/WebCore/rendering/SimpleLineLayout.cpp b/Source/WebCore/rendering/SimpleLineLayout.cpp
>index 301300f6e37ded5672bc0d65a1af3ccf2e1c4336..03b5594d816a45eb10898d5fcb79bf9e81462a39 100644
>--- a/Source/WebCore/rendering/SimpleLineLayout.cpp
>+++ b/Source/WebCore/rendering/SimpleLineLayout.cpp
>@@ -50,6 +50,7 @@
> #include "Settings.h"
> #include "SimpleLineLayoutFlowContents.h"
> #include "SimpleLineLayoutFunctions.h"
>+#include "SimpleLineLayoutResolver.h"
> #include "SimpleLineLayoutTextFragmentIterator.h"
> #include "Text.h"
> #include "TextPaintStyle.h"
>@@ -962,22 +963,34 @@ std::unique_ptr<Layout> create(RenderBlockFlow& flow)
>     unsigned lineCount = 0;
>     Layout::RunVector runs;
>     createTextRuns(runs, flow, lineCount);
>-    return Layout::create(runs, lineCount);
>+    return Layout::create(runs, lineCount, flow);
> }
> 
>-std::unique_ptr<Layout> Layout::create(const RunVector& runVector, unsigned lineCount)
>+std::unique_ptr<Layout> Layout::create(const RunVector& runVector, unsigned lineCount, RenderBlockFlow& flow)
> {
>     void* slot = WTF::fastMalloc(sizeof(Layout) + sizeof(Run) * runVector.size());
>-    return std::unique_ptr<Layout>(new (NotNull, slot) Layout(runVector, lineCount));
>+    return std::unique_ptr<Layout>(new (NotNull, slot) Layout(runVector, lineCount, flow));
> }
> 
>-Layout::Layout(const RunVector& runVector, unsigned lineCount)
>+Layout::Layout(const RunVector& runVector, unsigned lineCount, RenderBlockFlow& blockFlow)
>     : m_lineCount(lineCount)
>     , m_runCount(runVector.size())
>+    , m_runResolver(std::make_unique<RunResolver>(blockFlow, *this))
>+    , m_lineResolver(std::make_unique<LineResolver>(*m_runResolver))
> {
>     memcpy(m_runs, runVector.data(), m_runCount * sizeof(Run));
> }
> 
>+RunResolver& Layout::runResolver() const
>+{
>+    return *m_runResolver;
>+}
>+
>+LineResolver& Layout::lineResolver() const
>+{
>+    return *m_lineResolver;
>+}
>+
> Layout::~Layout()
> {
>     simpleLineLayoutWillBeDeleted(*this);
>diff --git a/Source/WebCore/rendering/SimpleLineLayout.h b/Source/WebCore/rendering/SimpleLineLayout.h
>index 527447d56814d5f20e1b141cfc1c11b84477c8d2..85837af448d05bc16bd7b3c6ec3c8e581fe35e56 100644
>--- a/Source/WebCore/rendering/SimpleLineLayout.h
>+++ b/Source/WebCore/rendering/SimpleLineLayout.h
>@@ -41,10 +41,12 @@ class RenderBlockFlow;
> 
> namespace SimpleLineLayout {
> 
>+class LineResolver;
>+class RunResolver;
>+
> bool canUseFor(const RenderBlockFlow&);
> AvoidanceReasonFlags canUseForWithReason(const RenderBlockFlow&, IncludeReasons);
> 
>-
> struct Run {
> #if COMPILER(MSVC)
>     Run() { }
>@@ -79,7 +81,7 @@ class Layout {
> public:
>     using RunVector = Vector<Run, 10>;
>     using SimpleLineStruts = Vector<SimpleLineStrut, 4>;
>-    static std::unique_ptr<Layout> create(const RunVector&, unsigned lineCount);
>+    static std::unique_ptr<Layout> create(const RunVector&, unsigned lineCount, RenderBlockFlow&);
> 
>     ~Layout();
> 
>@@ -93,13 +95,18 @@ public:
>     bool hasLineStruts() const { return !m_lineStruts.isEmpty(); }
>     void setLineStruts(SimpleLineStruts&& lineStruts) { m_lineStruts = lineStruts; }
>     const SimpleLineStruts& struts() const { return m_lineStruts; }
>+    RunResolver& runResolver() const;
>+    LineResolver& lineResolver() const;
>+
> private:
>-    Layout(const RunVector&, unsigned lineCount);
>+    Layout(const RunVector&, unsigned lineCount, RenderBlockFlow&);
> 
>     unsigned m_lineCount;
>     unsigned m_runCount;
>     bool m_isPaginated { false };
>     SimpleLineStruts m_lineStruts;
>+    std::unique_ptr<RunResolver> m_runResolver;
>+    std::unique_ptr<LineResolver> m_lineResolver;
>     Run m_runs[0];
> };
> 
>diff --git a/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp b/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp
>index faf46ccb641e4180f53db1783e3f8ae6f8ad11c4..80333a0dbd76dafd4abae0e600bfe675f880e529 100644
>--- a/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp
>+++ b/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp
>@@ -105,7 +105,7 @@ void paintFlow(const RenderBlockFlow& flow, const Layout& layout, PaintInfo& pai
>     LayoutRect paintRect = paintInfo.rect;
>     paintRect.moveBy(-paintOffset);
> 
>-    auto resolver = runResolver(flow, layout);
>+    auto resolver = layout.runResolver();
>     float deviceScaleFactor = flow.document().deviceScaleFactor();
>     for (auto run : resolver.rangeForRect(paintRect)) {
>         if (run.start() == run.end())
>@@ -147,7 +147,7 @@ bool hitTestFlow(const RenderBlockFlow& flow, const Layout& layout, const HitTes
> 
>     LayoutRect rangeRect = locationInContainer.boundingBox();
>     rangeRect.moveBy(-accumulatedOffset);
>-    auto resolver = lineResolver(flow, layout);
>+    auto resolver = layout.lineResolver();
>     auto range = resolver.rangeForRect(rangeRect);
>     for (auto it = range.begin(), end = range.end(); it != end; ++it) {
>         auto lineRect = *it;
>@@ -164,7 +164,7 @@ bool hitTestFlow(const RenderBlockFlow& flow, const Layout& layout, const HitTes
> 
> void collectFlowOverflow(RenderBlockFlow& flow, const Layout& layout)
> {
>-    for (auto lineRect : lineResolver(flow, layout)) {
>+    for (auto lineRect : layout.lineResolver()) {
>         LayoutRect visualOverflowRect = LayoutRect(computeOverflow(flow, lineRect));
>         flow.addLayoutOverflow(LayoutRect(lineRect));
>         flow.addVisualOverflow(visualOverflowRect);
>@@ -173,7 +173,7 @@ void collectFlowOverflow(RenderBlockFlow& flow, const Layout& layout)
> 
> IntRect computeBoundingBox(const RenderObject& renderer, const Layout& layout)
> {
>-    auto resolver = runResolver(downcast<RenderBlockFlow>(*renderer.parent()), layout);
>+    auto resolver = layout.runResolver();
>     FloatRect boundingBoxRect;
>     for (auto run : resolver.rangeForRenderer(renderer)) {
>         FloatRect rect = run.rect();
>@@ -187,7 +187,7 @@ IntRect computeBoundingBox(const RenderObject& renderer, const Layout& layout)
> 
> IntPoint computeFirstRunLocation(const RenderObject& renderer, const Layout& layout)
> {
>-    auto resolver = runResolver(downcast<RenderBlockFlow>(*renderer.parent()), layout);
>+    auto resolver = layout.runResolver();
>     auto range = resolver.rangeForRenderer(renderer);
>     auto begin = range.begin();
>     if (begin == range.end())
>@@ -198,7 +198,7 @@ IntPoint computeFirstRunLocation(const RenderObject& renderer, const Layout& lay
> Vector<IntRect> collectAbsoluteRects(const RenderObject& renderer, const Layout& layout, const LayoutPoint& accumulatedOffset)
> {
>     Vector<IntRect> rects;
>-    auto resolver = runResolver(downcast<RenderBlockFlow>(*renderer.parent()), layout);
>+    auto resolver = layout.runResolver();
>     for (auto run : resolver.rangeForRenderer(renderer)) {
>         FloatRect rect = run.rect();
>         rects.append(enclosingIntRect(FloatRect(accumulatedOffset + rect.location(), rect.size())));
>@@ -209,7 +209,7 @@ Vector<IntRect> collectAbsoluteRects(const RenderObject& renderer, const Layout&
> Vector<FloatQuad> collectAbsoluteQuads(const RenderObject& renderer, const Layout& layout, bool* wasFixed)
> {
>     Vector<FloatQuad> quads;
>-    auto resolver = runResolver(downcast<RenderBlockFlow>(*renderer.parent()), layout);
>+    auto resolver = layout.runResolver();
>     for (auto run : resolver.rangeForRenderer(renderer))
>         quads.append(renderer.localToAbsoluteQuad(FloatQuad(run.rect()), UseTransforms, wasFixed));
>     return quads;
>@@ -219,7 +219,7 @@ unsigned textOffsetForPoint(const LayoutPoint& point, const RenderText& renderer
> {
>     auto& flow = downcast<RenderBlockFlow>(*renderer.parent());
>     ASSERT(flow.firstChild() == flow.lastChild());
>-    auto resolver = runResolver(flow, layout);
>+    auto resolver = layout.runResolver();
>     auto it = resolver.runForPoint(point);
>     if (it == resolver.end())
>         return renderer.text().length();
>@@ -234,7 +234,7 @@ Vector<FloatQuad> collectAbsoluteQuadsForRange(const RenderObject& renderer, uns
> {
>     auto& style = downcast<RenderBlockFlow>(*renderer.parent()).style();
>     Vector<FloatQuad> quads;
>-    auto resolver = runResolver(downcast<RenderBlockFlow>(*renderer.parent()), layout);
>+    auto resolver = layout.runResolver();
>     for (auto run : resolver.rangeForRendererWithOffsets(renderer, start, end)) {
>         // This run is fully contained.
>         if (start <= run.start() && end >= run.end()) {
>@@ -320,7 +320,7 @@ void generateLineBoxTree(RenderBlockFlow& flow, const Layout& layout)
>         return;
> 
>     Ref<BidiContext> bidiContext = BidiContext::create(0, U_LEFT_TO_RIGHT);
>-    auto resolver = runResolver(flow, layout);
>+    auto resolver = layout.runResolver();
>     unsigned lineIndex = 0;
>     while (true) {
>         auto range = resolver.rangeForLine(lineIndex++);
>diff --git a/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp b/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp
>index 4764295c21faf006036a37ce572b0a2d2bac8cd5..b1cf83144dfbdad32f210e9aa4773ec5e0692130 100644
>--- a/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp
>+++ b/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp
>@@ -313,8 +313,8 @@ const RenderObject& LineResolver::Iterator::renderer() const
>     return m_runIterator.resolver().flowContents().segmentForRun(run.start(), run.end()).renderer;
> }
> 
>-LineResolver::LineResolver(const RenderBlockFlow& flow, const Layout& layout)
>-    : m_runResolver(flow, layout)
>+LineResolver::LineResolver(RunResolver& runResolver)
>+    : m_runResolver(runResolver)
> {
> }
> 
>diff --git a/Source/WebCore/rendering/SimpleLineLayoutResolver.h b/Source/WebCore/rendering/SimpleLineLayoutResolver.h
>index 0e8f207a99a6f4ef42bb913dc5ee8b22431b377c..6c9b51a5f58c265ece11ebd9b7992584f6bd965f 100644
>--- a/Source/WebCore/rendering/SimpleLineLayoutResolver.h
>+++ b/Source/WebCore/rendering/SimpleLineLayoutResolver.h
>@@ -27,6 +27,7 @@
> 
> #include "LayoutRect.h"
> #include "RenderBlockFlow.h"
>+#include "SimpleLineLayout.h"
> #include "SimpleLineLayoutFlowContents.h"
> #include <wtf/IteratorRange.h>
> #include <wtf/text/WTFString.h>
>@@ -143,7 +144,7 @@ public:
>         RunResolver::Iterator m_runIterator;
>     };
> 
>-    LineResolver(const RenderBlockFlow&, const Layout&);
>+    LineResolver(RunResolver&);
> 
>     Iterator begin() const;
>     Iterator end() const;
>@@ -151,11 +152,10 @@ public:
>     WTF::IteratorRange<Iterator> rangeForRect(const LayoutRect&) const;
> 
> private:
>-    RunResolver m_runResolver;
>+    RunResolver& m_runResolver;
> };
> 
> RunResolver runResolver(const RenderBlockFlow&, const Layout&);
>-LineResolver lineResolver(const RenderBlockFlow&, const Layout&);
> 
> inline unsigned RunResolver::Run::start() const
> {
>@@ -297,10 +297,5 @@ inline RunResolver runResolver(const RenderBlockFlow& flow, const Layout& layout
>     return RunResolver(flow, layout);
> }
> 
>-inline LineResolver lineResolver(const RenderBlockFlow& flow, const Layout& layout)
>-{
>-    return LineResolver(flow, layout);
>-}
>-
> }
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 185411: 339794 | 339834 | 339885