Attachment 273424 Details for Bug 153991 – Patch (move paintChildren functions)

[patch] Patch (move paintChildren functions)

bug-153991-paintChildren.patch (text/plain), 8.92 KB, created by Frédéric Wang Nélar on 2016-03-09 05:21:48 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang Nélar

Created: 2016-03-09 05:21:48 PST

Size: 8.92 KB

patch

obsolete

>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp b/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp
>index 8da4ac8..96f4e14 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLBlock.cpp
>@@ -88,5 +88,13 @@ int RenderMathMLBlock::baselinePosition(FontBaseline baselineType, bool firstLin
>     });
> }
> 
>+void RenderMathMLBlock::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
>+{
>+    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
>+        if (!paintChild(*child, paintInfo, paintOffset, paintInfoForChild, usePrintRect, PaintAsInlineBlock))
>+            return;
>+    }
>+}
>+
> const char* RenderMathMLBlock::renderName() const
> {
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLBlock.h b/Source/WebCore/rendering/mathml/RenderMathMLBlock.h
>index eac7fee..5d088d6 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLBlock.h
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLBlock.h
>@@ -57,6 +57,8 @@ public:
>     
>     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
>     
>+    virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) override;
>+
> #if ENABLE(DEBUG_MATH_LAYOUT)
>     virtual void paint(PaintInfo&, const LayoutPoint&);
> #endif
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp b/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
>index 4730318..1e6df05 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp
>@@ -226,14 +226,6 @@ Optional<int> RenderMathMLFraction::firstLineBaseline() const
>     return RenderMathMLBlock::firstLineBaseline();
> }
> 
>-void RenderMathMLFraction::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
>-{
>-    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
>-        if (!paintChild(*child, paintInfo, paintOffset, paintInfoForChild, usePrintRect, PaintAsInlineBlock))
>-            return;
>-    }
>-}
>-
> }
> 
> #endif // ENABLE(MATHML)
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLFraction.h b/Source/WebCore/rendering/mathml/RenderMathMLFraction.h
>index 384a959..f6c2a71 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLFraction.h
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLFraction.h
>@@ -43,7 +43,6 @@ public:
>     float relativeLineThickness() const { return m_defaultLineThickness ? m_lineThickness / m_defaultLineThickness : LayoutUnit(0); }
> 
>     virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override final;
>-    virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) override final;
> 
> protected:
>     virtual void computePreferredLogicalWidths() override;
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp b/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
>index b922abd..e01073e 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp
>@@ -257,14 +257,6 @@ void RenderMathMLRoot::layoutBlock(bool relayoutChildren, LayoutUnit)
>     clearNeedsLayout();
> }
> 
>-void RenderMathMLRoot::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
>-{
>-    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
>-        if (!paintChild(*child, paintInfo, paintOffset, paintInfoForChild, usePrintRect, PaintAsInlineBlock))
>-            return;
>-    }
>-}
>-
> void RenderMathMLRoot::paint(PaintInfo& info, const LayoutPoint& paintOffset)
> {
>     RenderMathMLRow::paint(info, paintOffset);
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLRoot.h b/Source/WebCore/rendering/mathml/RenderMathMLRoot.h
>index c3ac3dc..c024cdd 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLRoot.h
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLRoot.h
>@@ -56,7 +56,6 @@ public:
> 
>     virtual void computePreferredLogicalWidths() override;
>     virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override final;
>-    virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) override final;
> 
> protected:
>     virtual void paint(PaintInfo&, const LayoutPoint&) override;
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp b/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp
>index 6a0d3a9..1fcf37d 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLRow.cpp
>@@ -213,14 +213,6 @@ void RenderMathMLRow::layoutBlock(bool relayoutChildren, LayoutUnit)
>     clearNeedsLayout();
> }
> 
>-void RenderMathMLRow::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
>-{
>-    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
>-        if (!paintChild(*child, paintInfo, paintOffset, paintInfoForChild, usePrintRect, PaintAsInlineBlock))
>-            return;
>-    }
>-}
>-
> }
> 
> #endif // ENABLE(MATHML)
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLRow.h b/Source/WebCore/rendering/mathml/RenderMathMLRow.h
>index 3ae0934..f3cf234 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLRow.h
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLRow.h
>@@ -43,7 +43,6 @@ public:
>     void updateOperatorProperties();
> 
>     virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override;
>-    virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) override;
>     virtual Optional<int> firstLineBaseline() const override;
> 
> protected:
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp b/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp
>index 056d003..cd6a64f 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLScripts.cpp
>@@ -408,14 +408,6 @@ Optional<int> RenderMathMLScripts::firstLineBaseline() const
>     return RenderMathMLBlock::firstLineBaseline();
> }
> 
>-void RenderMathMLScripts::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
>-{
>-    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
>-        if (!paintChild(*child, paintInfo, paintOffset, paintInfoForChild, usePrintRect, PaintAsInlineBlock))
>-            return;
>-    }
>-}
>-
> }    
> 
> #endif // ENABLE(MATHML)
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLScripts.h b/Source/WebCore/rendering/mathml/RenderMathMLScripts.h
>index bd863ed..7faf8ab 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLScripts.h
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLScripts.h
>@@ -40,7 +40,6 @@ public:
>     virtual RenderMathMLOperator* unembellishedOperator() override;
>     virtual Optional<int> firstLineBaseline() const override;
>     virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override final;
>-    virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) override final;
> 
> private:
>     virtual bool isRenderMathMLScripts() const override { return true; }
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp b/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp
>index c8fea48..4330327 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.cpp
>@@ -225,14 +225,6 @@ void RenderMathMLUnderOver::layoutBlock(bool relayoutChildren, LayoutUnit)
>     clearNeedsLayout();
> }
> 
>-void RenderMathMLUnderOver::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& paintInfoForChild, bool usePrintRect)
>-{
>-    for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
>-        if (!paintChild(*child, paintInfo, paintOffset, paintInfoForChild, usePrintRect, PaintAsInlineBlock))
>-            return;
>-    }
>-}
>-
> }
> 
> #endif // ENABLE(MATHML)
>diff --git a/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h b/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h
>index 4602058..c0f5760 100644
>--- a/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h
>+++ b/Source/WebCore/rendering/mathml/RenderMathMLUnderOver.h
>@@ -42,7 +42,6 @@ public:
>     virtual Optional<int> firstLineBaseline() const override;
> 
>     virtual void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override final;
>-    virtual void paintChildren(PaintInfo& forSelf, const LayoutPoint&, PaintInfo& forChild, bool usePrintRect) override final;
> 
> private:
>     virtual bool isRenderMathMLUnderOver() const override { return true; }

Actions: View | Formatted Diff | Diff

Attachments on bug 153991: 270869 | 271166 | 273424 | 273425 | 274089 | 274092 | 274103 | 275294 | 277377 | 278726 | 281973 | 281989 | 281997 | 281998 | 281999 | 282000 | 282048 | 282050 | 282111 | 282113 | 282521 | 282584 | 283015