Changeset 225148 in webkit

Timestamp:

Nov 26, 2017 2:13:08 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Cleanup code for RenderMathMLUnderOver::layoutBlock
​https://bugs.webkit.org/show_bug.cgi?id=179681

Patch by Minsheng Liu <​lambda@liu.ms> on 2017-11-26
Reviewed by Frédéric Wang.

The patch removes some unnecessary calls to layoutIfNeeds() and guards the change
with assertion. Since there is no behavior change, no new tests are required.

• rendering/mathml/RenderMathMLUnderOver.cpp:

(WebCore::RenderMathMLUnderOver::stretchHorizontalOperatorsAndLayoutChildren):
(WebCore::RenderMathMLUnderOver::layoutBlock):
(WebCore::RenderMathMLUnderOver::computeOperatorsHorizontalStretch): Deleted.

• rendering/mathml/RenderMathMLUnderOver.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/mathml/RenderMathMLUnderOver.cpp (modified) (2 diffs)
• rendering/mathml/RenderMathMLUnderOver.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-26  Minsheng Liu  <lambda@liu.ms>
+
+        Cleanup code for RenderMathMLUnderOver::layoutBlock
+        https://bugs.webkit.org/show_bug.cgi?id=179681
+
+        Reviewed by Frédéric Wang.
+
+        The patch removes some unnecessary calls to layoutIfNeeds() and guards the change
+        with assertion. Since there is no behavior change, no new tests are required.
+
+        * rendering/mathml/RenderMathMLUnderOver.cpp:
+        (WebCore::RenderMathMLUnderOver::stretchHorizontalOperatorsAndLayoutChildren):
+        (WebCore::RenderMathMLUnderOver::layoutBlock):
+        (WebCore::RenderMathMLUnderOver::computeOperatorsHorizontalStretch): Deleted.
+        * rendering/mathml/RenderMathMLUnderOver.h:
+
 2017-11-26  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -51 +51 @@
 }
 
-void RenderMathMLUnderOver::computeOperatorsHorizontalStretch()
+void RenderMathMLUnderOver::stretchHorizontalOperatorsAndLayoutChildren()
 {
     LayoutUnit stretchWidth = 0;
@@ -262 +262 @@
     recomputeLogicalWidth();
 
-    computeOperatorsHorizontalStretch();
-
-    base().layoutIfNeeded();
-    if (m_scriptType == Under || m_scriptType == UnderOver)
-        under().layoutIfNeeded();
-    if (m_scriptType == Over || m_scriptType == UnderOver)
-        over().layoutIfNeeded();
-
+    stretchHorizontalOperatorsAndLayoutChildren();
+
+    ASSERT(!base().needsLayout());
+    ASSERT(m_scriptType == Over || !under().needsLayout());
+    ASSERT(m_scriptType == Under || !over().needsLayout());
+    
     LayoutUnit logicalWidth = base().logicalWidth();
     if (m_scriptType == Under || m_scriptType == UnderOver)

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

@@ -49 +49 @@
     void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final;
 
-    void computeOperatorsHorizontalStretch();
+    void stretchHorizontalOperatorsAndLayoutChildren();
     bool isValid() const;
     bool shouldMoveLimits();