Changeset 157810 in webkit

Timestamp:

Oct 22, 2013, 2:03:38 PM (11 years ago)

Author:

Antti Koivisto

Message:

Rename some line box functions to be just about lines
​https://bugs.webkit.org/show_bug.cgi?id=123168

Reviewed by Dave Hyatt.

firstLineBoxBaseline -> firstLineBaseline
hasInlineBoxChildren -> hasLines

Also use hasLines in a bunch of places where firstLineBox() was used.

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):

Also use hasRenderedText() instead of firstTextBox()

• rendering/RenderFullScreen.cpp:

Fix namespace.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityRenderObject.cpp (modified) (3 diffs)
• rendering/InlineTextBox.cpp (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (4 diffs)
• rendering/RenderBlock.h (modified) (2 diffs)
• rendering/RenderBlockFlow.cpp (modified) (5 diffs)
• rendering/RenderBlockFlow.h (modified) (2 diffs)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderDeprecatedFlexibleBox.cpp (modified) (2 diffs)
• rendering/RenderFlexibleBox.cpp (modified) (5 diffs)
• rendering/RenderFlexibleBox.h (modified) (1 diff)
• rendering/RenderFullScreen.cpp (modified) (2 diffs)
• rendering/RenderMenuList.h (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (3 diffs)
• rendering/RenderTable.h (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (1 diff)
• rendering/RenderTableSection.cpp (modified) (1 diff)
• rendering/RenderTableSection.h (modified) (1 diff)
• rendering/RenderTextControl.h (modified) (1 diff)
• rendering/mathml/RenderMathMLBlock.cpp (modified) (2 diffs)
• rendering/mathml/RenderMathMLBlock.h (modified) (1 diff)
• rendering/mathml/RenderMathMLFraction.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLFraction.h (modified) (1 diff)
• rendering/mathml/RenderMathMLOperator.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLOperator.h (modified) (1 diff)
• rendering/mathml/RenderMathMLScripts.cpp (modified) (4 diffs)
• rendering/mathml/RenderMathMLScripts.h (modified) (1 diff)
• rendering/mathml/RenderMathMLSpace.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLSpace.h (modified) (1 diff)
• rendering/mathml/RenderMathMLUnderOver.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLUnderOver.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-22  Antti Koivisto  <antti@apple.com>
+
+        Rename some line box functions to be just about lines
+        https://bugs.webkit.org/show_bug.cgi?id=123168
+
+        Reviewed by Dave Hyatt.
+
+        firstLineBoxBaseline -> firstLineBaseline
+        hasInlineBoxChildren -> hasLines
+        
+        Also use hasLines in a bunch of places where firstLineBox() was used.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+        
+            Also use hasRenderedText() instead of firstTextBox()
+
+        * rendering/RenderFullScreen.cpp:
+        
+            Fix namespace.
+
 2013-10-22  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -1167 +1167 @@
         if (parent && (parent->isMenuItem() || parent->ariaRoleAttribute() == MenuButtonRole))
             return true;
-        RenderText* renderText = toRenderText(m_renderer);
-        if (!renderText->firstTextBox())
+        auto& renderText = toRenderText(*m_renderer);
+        if (!renderText.hasRenderedText())
             return true;
 
@@ -1178 +1178 @@
 
         // text elements that are just empty whitespace should not be returned
-        return renderText->text()->containsOnlyWhitespace();
+        return renderText.text()->containsOnlyWhitespace();
     }
     
@@ -1232 +1232 @@
     
     if (m_renderer->isRenderBlockFlow() && m_renderer->childrenInline() && !canSetFocusAttribute())
-        return !toRenderBlockFlow(m_renderer)->firstLineBox() && !mouseButtonListener();
+        return !toRenderBlockFlow(m_renderer)->hasLines() && !mouseButtonListener();
     
     // ignore images seemingly used as spacers

trunk/Source/WebCore/rendering/InlineTextBox.cpp

@@ -466 +466 @@
 
     // The emphasis marks over are suppressed only if there is a ruby text box and it not empty.
-    return !rubyText || !rubyText->firstLineBox();
+    return !rubyText || !rubyText->hasLines();
 }
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -1196 +1196 @@
         // line boxes, then we can't be self-collapsing, since we have content.
         if (childrenInline())
-            return !hasInlineBoxChildren();
+            return !hasLines();
         
         // Whether or not we collapse is dependent on whether all our normal flow children
@@ -4618 +4618 @@
 }
 
-int RenderBlock::firstLineBoxBaseline() const
+int RenderBlock::firstLineBaseline() const
 {
     if (isWritingModeRoot() && !isRubyRun())
@@ -4625 +4625 @@
     for (RenderBox* curr = firstChildBox(); curr; curr = curr->nextSiblingBox()) {
         if (!curr->isFloatingOrOutOfFlowPositioned()) {
-            int result = curr->firstLineBoxBaseline();
+            int result = curr->firstLineBaseline();
             if (result != -1)
                 return curr->logicalTop() + result; // Translate to our coordinate space.
@@ -4640 +4640 @@
 
     bool haveNormalFlowChild = false;
-    for (RenderBox* curr = lastChildBox(); curr; curr = curr->previousSiblingBox()) {
-        if (!curr->isFloatingOrOutOfFlowPositioned()) {
-            haveNormalFlowChild = true;
-            int result = curr->inlineBlockBaseline(lineDirection);
-            if (result != -1)
-                return curr->logicalTop() + result; // Translate to our coordinate space.
-        }
+    for (auto box = lastChildBox(); box; box = box->previousSiblingBox()) {
+        if (box->isFloatingOrOutOfFlowPositioned())
+            continue;
+        haveNormalFlowChild = true;
+        int result = box->inlineBlockBaseline(lineDirection);
+        if (result != -1)
+            return box->logicalTop() + result; // Translate to our coordinate space.
     }
 
     if (!haveNormalFlowChild && hasLineIfEmpty()) {
-        const FontMetrics& fontMetrics = firstLineStyle()->fontMetrics();
+        auto& fontMetrics = firstLineStyle()->fontMetrics();
         return fontMetrics.ascent()
              + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -459 +459 @@
     void adjustIntrinsicLogicalWidthsForColumns(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const;
 
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
     virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;
 
@@ -542 +542 @@
     virtual bool isSelfCollapsingBlock() const OVERRIDE FINAL;
     // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
-    virtual bool hasInlineBoxChildren() const { return false; }
+    virtual bool hasLines() const { return false; }
 
     void insertIntoTrackedRendererMaps(RenderBox* descendant, TrackedDescendantsMap*&, TrackedContainerMap*&);

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -2489 +2489 @@
 }
 
-int RenderBlockFlow::firstLineBoxBaseline() const
+int RenderBlockFlow::firstLineBaseline() const
 {
     if (isWritingModeRoot() && !isRubyRun())
@@ -2495 +2495 @@
 
     if (!childrenInline())
-        return RenderBlock::firstLineBoxBaseline();
+        return RenderBlock::firstLineBaseline();
 
     if (firstLineBox())
@@ -2511 +2511 @@
         return RenderBlock::inlineBlockBaseline(lineDirection);
 
-    if (!firstLineBox() && hasLineIfEmpty()) {
+    if (!hasLines()) {
+        if (!hasLineIfEmpty())
+            return -1;
         const FontMetrics& fontMetrics = firstLineStyle()->fontMetrics();
         return fontMetrics.ascent()
@@ -2518 +2520 @@
     }
 
-    if (lastLineBox()) {
-        bool isFirstLine = lastLineBox() == firstLineBox();
-        RenderStyle* style = isFirstLine ? firstLineStyle() : this->style();
-        return lastLineBox()->logicalTop() + style->fontMetrics().ascent(lastRootBox()->baselineType());
-    }
-    return -1;
+    bool isFirstLine = lastLineBox() == firstLineBox();
+    RenderStyle* style = isFirstLine ? firstLineStyle() : this->style();
+    return lastLineBox()->logicalTop() + style->fontMetrics().ascent(lastRootBox()->baselineType());
 }
 
@@ -2533 +2532 @@
     bool containsStart = selectionState() == SelectionStart || selectionState() == SelectionBoth;
 
-    if (!firstLineBox()) {
+    if (!hasLines()) {
         if (containsStart) {
             // Go ahead and update our lastLogicalTop to be the bottom of the block.  <hr>s or empty blocks with height can trip this

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -308 +308 @@
     RootInlineBox* lastRootBox() const { return static_cast<RootInlineBox*>(lastLineBox()); }
 
-    virtual bool hasInlineBoxChildren() const OVERRIDE FINAL { return firstLineBox(); }
+    virtual bool hasLines() const OVERRIDE FINAL { return firstLineBox(); }
 
     // Helper methods for computing line counts and heights for line counts.
@@ -365 +365 @@
     void createFloatingObjects();
 
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
     virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -509 +509 @@
     RenderLayer* enclosingFloatPaintingLayer() const;
     
-    virtual int firstLineBoxBaseline() const { return -1; }
+    virtual int firstLineBaseline() const { return -1; }
     virtual int inlineBlockBaseline(LineDirectionMode) const { return -1; } // Returns -1 if we should skip this box when computing the baseline of an inline-block.
 

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -442 +442 @@
             // Update our height and overflow height.
             if (style()->boxAlign() == BBASELINE) {
-                LayoutUnit ascent = child->firstLineBoxBaseline();
+                LayoutUnit ascent = child->firstLineBaseline();
                 if (ascent == -1)
                     ascent = child->height() + child->marginBottom();
@@ -520 +520 @@
                     break;
                 case BBASELINE: {
-                    LayoutUnit ascent = child->firstLineBoxBaseline();
+                    LayoutUnit ascent = child->firstLineBaseline();
                     if (ascent == -1)
                         ascent = child->height() + child->marginBottom();

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -242 +242 @@
 int RenderFlexibleBox::baselinePosition(FontBaseline, bool, LineDirectionMode direction, LinePositionMode) const
 {
-    int baseline = firstLineBoxBaseline();
+    int baseline = firstLineBaseline();
     if (baseline == -1)
         baseline = synthesizedBaselineFromContentBox(this, direction);
@@ -250 +250 @@
 }
 
-int RenderFlexibleBox::firstLineBoxBaseline() const
+int RenderFlexibleBox::firstLineBaseline() const
 {
     if (isWritingModeRoot() || m_numberOfInFlowChildrenOnFirstLine <= 0)
@@ -279 +279 @@
         return mainAxisExtentForChild(baselineChild) + baselineChild->logicalTop();
 
-    int baseline = baselineChild->firstLineBoxBaseline();
+    int baseline = baselineChild->firstLineBaseline();
     if (baseline == -1) {
         // FIXME: We should pass |direction| into firstLineBoxBaseline and stop bailing out if we're a writing mode root.
@@ -292 +292 @@
 int RenderFlexibleBox::inlineBlockBaseline(LineDirectionMode direction) const
 {
-    int baseline = firstLineBoxBaseline();
+    int baseline = firstLineBaseline();
     if (baseline != -1)
         return baseline;
@@ -895 +895 @@
 LayoutUnit RenderFlexibleBox::marginBoxAscentForChild(RenderBox* child)
 {
-    LayoutUnit ascent = child->firstLineBoxBaseline();
+    LayoutUnit ascent = child->firstLineBaseline();
     if (ascent == -1)
         ascent = crossAxisExtentForChild(child);

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -50 +50 @@
 
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
     virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;
 

trunk/Source/WebCore/rendering/RenderFullScreen.cpp

@@ -36 +36 @@
 #endif
 
-using namespace WebCore;
+namespace WebCore {
 
 class RenderFullScreenPlaceholder FINAL : public RenderBlockFlow {
@@ -186 +186 @@
 }
 
+}
+
 #endif

trunk/Source/WebCore/rendering/RenderMenuList.h

@@ -123 +123 @@
         return RenderBlock::baselinePosition(baseline, firstLine, direction, position);
     }
-    virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firstLineBoxBaseline(); }
+    virtual int firstLineBaseline() const OVERRIDE { return RenderBlock::firstLineBaseline(); }
     virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return RenderBlock::inlineBlockBaseline(direction); }
 

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -1336 +1336 @@
 int RenderTable::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
 {
-    LayoutUnit baseline = firstLineBoxBaseline();
+    LayoutUnit baseline = firstLineBaseline();
     if (baseline != -1)
         return baseline;
@@ -1349 +1349 @@
 }
 
-int RenderTable::firstLineBoxBaseline() const
+int RenderTable::firstLineBaseline() const
 {
     // The baseline of a 'table' is the same as the 'inline-table' baseline per CSS 3 Flexbox (CSS 2.1
@@ -1364 +1364 @@
         return -1;
 
-    int baseline = topNonEmptySection->firstLineBoxBaseline();
+    int baseline = topNonEmptySection->firstLineBaseline();
     if (baseline > 0)
         return topNonEmptySection->logicalTop() + baseline;

trunk/Source/WebCore/rendering/RenderTable.h

@@ -285 +285 @@
 
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
     virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE FINAL;
 

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -398 +398 @@
     // the first in-flow line box in the cell, or the first in-flow table-row in the cell, whichever comes first. If there
     // is no such line box or table-row, the baseline is the bottom of content edge of the cell box.
-    LayoutUnit firstLineBaseline = firstLineBoxBaseline();
-    if (firstLineBaseline != -1)
-        return firstLineBaseline;
+    LayoutUnit baseline = firstLineBaseline();
+    if (baseline != -1)
+        return baseline;
     return borderAndPaddingBefore() + contentLogicalHeight();
 }

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -916 +916 @@
 }
 
-int RenderTableSection::firstLineBoxBaseline() const
+int RenderTableSection::firstLineBaseline() const
 {
     if (!m_grid.size())

trunk/Source/WebCore/rendering/RenderTableSection.h

@@ -74 +74 @@
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE;
 
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
 
     void addCell(RenderTableCell*, RenderTableRow* row);

trunk/Source/WebCore/rendering/RenderTextControl.h

@@ -115 +115 @@
         return RenderBlock::baselinePosition(baseline, firstLine, direction, position);
     }
-    virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firstLineBoxBaseline(); }
+    virtual int firstLineBaseline() const OVERRIDE { return RenderBlock::firstLineBaseline(); }
     virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return RenderBlock::inlineBlockBaseline(direction); }
 

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

@@ -75 +75 @@
         return 0;
     
-    LayoutUnit baseline = firstLineBoxBaseline(); // FIXME: This may be unnecessary after flex baselines are implemented (https://bugs.webkit.org/show_bug.cgi?id=96188).
+    LayoutUnit baseline = firstLineBaseline(); // FIXME: This may be unnecessary after flex baselines are implemented (https://bugs.webkit.org/show_bug.cgi?id=96188).
     if (baseline != -1)
         return baseline;
@@ -302 +302 @@
 }
 
-int RenderMathMLTable::firstLineBoxBaseline() const
-{
-    // In legal MathML, we'll have a MathML parent. That RenderFlexibleBox parent will use our firstLineBoxBaseline() for baseline alignment, per
+int RenderMathMLTable::firstLineBaseline() const
+{
+    // In legal MathML, we'll have a MathML parent. That RenderFlexibleBox parent will use our firstLineBaseline() for baseline alignment, per
     // http://dev.w3.org/csswg/css3-flexbox/#flex-baselines. We want to vertically center an <mtable>, such as a matrix. Essentially the whole <mtable> element fits on a
     // single line, whose baseline gives this centering. This is different than RenderTable::firstLineBoxBaseline, which returns the baseline of the first row of a <table>.

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

@@ -108 +108 @@
     }
     
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
     
 private:

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

@@ -160 +160 @@
 }
 
-int RenderMathMLFraction::firstLineBoxBaseline() const
+int RenderMathMLFraction::firstLineBaseline() const
 {
     if (RenderBox* denominatorWrapper = lastChildBox())
         return denominatorWrapper->logicalTop() + static_cast<int>(lroundf((m_lineThickness + style()->fontMetrics().xHeight()) / 2));
-    return RenderMathMLBlock::firstLineBoxBaseline();
+    return RenderMathMLBlock::firstLineBaseline();
 }
 

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

@@ -48 +48 @@
     virtual void addChild(RenderObject* child, RenderObject* beforeChild) OVERRIDE;
     virtual void updateFromElement() OVERRIDE;
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
     virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
     virtual RenderMathMLOperator* unembellishedOperator() OVERRIDE;

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

@@ -266 +266 @@
 }
 
-int RenderMathMLOperator::firstLineBoxBaseline() const
+int RenderMathMLOperator::firstLineBaseline() const
 {
     if (m_isStretched)
         return expandedStretchHeight() * 2 / 3 - (expandedStretchHeight() - m_stretchHeight) / 2;
-    return RenderMathMLBlock::firstLineBoxBaseline();
+    return RenderMathMLBlock::firstLineBaseline();
 }
 

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

@@ -71 +71 @@
     virtual void computePreferredLogicalWidths() OVERRIDE;
     virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const OVERRIDE;
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
     virtual RenderMathMLOperator* unembellishedOperator() OVERRIDE { return this; }
 

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

@@ -280 +280 @@
 
     LayoutUnit baseHeight = base->logicalHeight();
-    LayoutUnit baseBaseline = base->firstLineBoxBaseline();
+    LayoutUnit baseBaseline = base->firstLineBaseline();
     if (baseBaseline == -1)
         baseBaseline = baseHeight;
@@ -314 +314 @@
         if (RenderBox* superscript = m_kind == Sub ? 0 : subSupPair->lastChildBox()) {
             LayoutUnit superscriptHeight = superscript->logicalHeight();
-            LayoutUnit superscriptBaseline = superscript->firstLineBoxBaseline();
+            LayoutUnit superscriptBaseline = superscript->firstLineBaseline();
             if (superscriptBaseline == -1)
                 superscriptBaseline = superscriptHeight;
@@ -324 +324 @@
         if (RenderBox* subscript = m_kind == Super ? 0 : subSupPair->firstChildBox()) {
             LayoutUnit subscriptHeight = subscript->logicalHeight();
-            LayoutUnit subscriptBaseline = subscript->firstLineBoxBaseline();
+            LayoutUnit subscriptBaseline = subscript->firstLineBaseline();
             if (subscriptBaseline == -1)
                 subscriptBaseline = subscriptHeight;
@@ -356 +356 @@
 }
 
-int RenderMathMLScripts::firstLineBoxBaseline() const
+int RenderMathMLScripts::firstLineBaseline() const
 {
     if (m_baseWrapper) {
-        LayoutUnit baseline = m_baseWrapper->firstLineBoxBaseline();
+        LayoutUnit baseline = m_baseWrapper->firstLineBaseline();
         if (baseline != -1)
             return baseline;
     }
-    return RenderMathMLBlock::firstLineBoxBaseline();
+    return RenderMathMLBlock::firstLineBaseline();
 }
 

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

@@ -103 +103 @@
     
     virtual RenderMathMLOperator* unembellishedOperator();
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
 
 protected:

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

@@ -92 +92 @@
 }
 
-int RenderMathMLSpace::firstLineBoxBaseline() const
+int RenderMathMLSpace::firstLineBaseline() const
 {
     return m_height;

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

@@ -46 +46 @@
     virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE;
     virtual void updateFromElement() OVERRIDE;
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
     virtual void updateLogicalWidth() OVERRIDE;
     virtual void updateLogicalHeight() OVERRIDE;

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

@@ -58 +58 @@
 }
 
-int RenderMathMLUnderOver::firstLineBoxBaseline() const
+int RenderMathMLUnderOver::firstLineBaseline() const
 {
     RenderBox* base = firstChildBox();
     if (!base)
         return -1;
-    LayoutUnit baseline = base->firstLineBoxBaseline();
+    LayoutUnit baseline = base->firstLineBaseline();
     if (baseline != -1)
         baseline += base->logicalTop();

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

@@ -39 +39 @@
     virtual RenderMathMLOperator* unembellishedOperator();
 
-    virtual int firstLineBoxBaseline() const OVERRIDE;
+    virtual int firstLineBaseline() const OVERRIDE;
     
 private: