Changeset 199771 in webkit

Timestamp:

Apr 20, 2016 6:25:39 AM (8 years ago)

Author:

fred.wang@free.fr

Message:

Refactor RenderMathMLSpace to avoid using flexbox
​https://bugs.webkit.org/show_bug.cgi?id=155168

Patch by Frederic Wang <​fwang@igalia.com> on 2016-04-20
Reviewed by Martin Robinson.

Source/WebCore:

No new tests, already covered by existing tests. The behavior of mspace-prefered-width-expected is not specified by the MathML recommendation, we update that test to match our new behavior.

• rendering/mathml/RenderMathMLSpace.cpp: Implement layout functions without passing by flebox.

(WebCore::RenderMathMLSpace::computePreferredLogicalWidths): Implement this function.
(WebCore::RenderMathMLSpace::layoutBlock): Implement this function.
(WebCore::RenderMathMLSpace::computeIntrinsicLogicalWidths): Deleted.
(WebCore::RenderMathMLSpace::updateLogicalWidth): Deleted.
(WebCore::RenderMathMLSpace::updateLogicalHeight): Deleted.

• rendering/mathml/RenderMathMLSpace.h: Update function declarations.

LayoutTests:

• mathml/presentation/mspace-prefered-width-expected.html: Update the expectation so that the logical width and preferred width are both equal to the one specified by the width attribute.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/mathml/presentation/mspace-prefered-width-expected.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp (modified) (2 diffs)
• Source/WebCore/rendering/mathml/RenderMathMLSpace.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-04-20  Frederic Wang  <fwang@igalia.com>
+
+        Refactor RenderMathMLSpace to avoid using flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=155168
+
+        Reviewed by Martin Robinson.
+
+        * mathml/presentation/mspace-prefered-width-expected.html: Update the expectation so that the logical width and preferred width are both equal to the one specified by the width attribute.
+
 2016-04-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/LayoutTests/mathml/presentation/mspace-prefered-width-expected.html

@@ -15 +15 @@
         </td>
     <td>
-         <span style="display: inline-block; width: 50px; height: 10px; background:green; margin-right: 50px;"></span>
+         <span style="display: inline-block; width: 50px; height: 10px; background:green;"></span>
         </td>
     <td>
-         <span style="display: inline-block; width: 50px; height: 10px; background:green; margin-right: -40px;"></span>
+         <span style="display: inline-block; width: 50px; height: 10px; background:green;"></span>
         </td>
   </tr>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-20  Frederic Wang  <fwang@igalia.com>
+
+        Refactor RenderMathMLSpace to avoid using flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=155168
+
+        Reviewed by Martin Robinson.
+
+        No new tests, already covered by existing tests. The behavior of mspace-prefered-width-expected is not specified by the MathML recommendation, we update that test to match our new behavior.
+
+        * rendering/mathml/RenderMathMLSpace.cpp: Implement layout functions without passing by flebox.
+        (WebCore::RenderMathMLSpace::computePreferredLogicalWidths): Implement this function.
+        (WebCore::RenderMathMLSpace::layoutBlock): Implement this function.
+        (WebCore::RenderMathMLSpace::computeIntrinsicLogicalWidths): Deleted.
+        (WebCore::RenderMathMLSpace::updateLogicalWidth): Deleted.
+        (WebCore::RenderMathMLSpace::updateLogicalHeight): Deleted.
+        * rendering/mathml/RenderMathMLSpace.h: Update function declarations.
+
 2016-04-20  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.cpp

@@ -45 +45 @@
 }
 
-void RenderMathMLSpace::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
+void RenderMathMLSpace::computePreferredLogicalWidths()
 {
-    minLogicalWidth = m_width;
-    maxLogicalWidth = m_width;
+    ASSERT(preferredLogicalWidthsDirty());
+
+    m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = m_width;
+
+    setPreferredLogicalWidthsDirty(false);
 }
 
@@ -76 +79 @@
 }
 
-void RenderMathMLSpace::updateLogicalWidth()
+void RenderMathMLSpace::layoutBlock(bool relayoutChildren, LayoutUnit)
 {
+    ASSERT(needsLayout());
+
+    if (!relayoutChildren && simplifiedLayout())
+        return;
+
     setLogicalWidth(m_width);
-}
+    setLogicalHeight(m_height + m_depth);
 
-void RenderMathMLSpace::updateLogicalHeight()
-{
-    setLogicalHeight(m_height + m_depth);
+    clearNeedsLayout();
 }
 

trunk/Source/WebCore/rendering/mathml/RenderMathMLSpace.h

@@ -40 +40 @@
 
 private:
-    const char* renderName() const override { return isAnonymous() ? "RenderMathMLSpace (anonymous)" : "RenderMathMLSpace"; }
-    bool isRenderMathMLSpace() const override { return true; }
-    void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
-    bool isChildAllowed(const RenderObject&, const RenderStyle&) const override { return false; }
-    void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
-    void updateFromElement() override;
-    Optional<int> firstLineBaseline() const override;
-    void updateLogicalWidth() override;
-    void updateLogicalHeight() override;
+    const char* renderName() const final { return isAnonymous() ? "RenderMathMLSpace (anonymous)" : "RenderMathMLSpace"; }
+    bool isRenderMathMLSpace() const final { return true; }
+    void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
+    bool isChildAllowed(const RenderObject&, const RenderStyle&) const final { return false; }
+    void updateFromElement() final;
+    void computePreferredLogicalWidths() final;
+    void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
+    Optional<int> firstLineBaseline() const final;
 
     LayoutUnit m_width;