Use the baseline information exposed by C++ to pipe baseline data through RenderBox.

sky/engine/core/rendering/RenderFlexibleBox.cpp

Index: sky/engine/core/rendering/RenderFlexibleBox.cpp
diff --git a/sky/engine/core/rendering/RenderFlexibleBox.cpp b/sky/engine/core/rendering/RenderFlexibleBox.cpp
index bfd8e9775d37444bfce59cd9ec3aa609c52ceca1..629f1c001c9281a008012d8b57e62343f4de6781 100644
--- a/sky/engine/core/rendering/RenderFlexibleBox.cpp
+++ b/sky/engine/core/rendering/RenderFlexibleBox.cpp
@@ -119,14 +119,14 @@ static int synthesizedBaselineFromContentBox(const RenderBox* box, LineDirection
 int RenderFlexibleBox::baselinePosition(FontBaseline, bool, LineDirectionMode direction, LinePositionMode mode) const
 {
     ASSERT(mode == PositionOnContainingLine);
-    int baseline = firstLineBoxBaseline();
+    int baseline = firstLineBoxBaseline(FontBaselineOrAuto());
     if (baseline == -1)
         baseline = synthesizedBaselineFromContentBox(this, direction);
 
     return beforeMarginInLineDirection(direction) + baseline;
 }
 
-int RenderFlexibleBox::firstLineBoxBaseline() const
+int RenderFlexibleBox::firstLineBoxBaseline(FontBaselineOrAuto baselineType) const
 {
     if (m_numberOfInFlowChildrenOnFirstLine <= 0)
         return -1;
@@ -155,7 +155,7 @@ int RenderFlexibleBox::firstLineBoxBaseline() const
     if (isColumnFlow() && !hasOrthogonalFlow(baselineChild))
         return mainAxisExtentForChild(baselineChild) + baselineChild->logicalTop();
 
-    int baseline = baselineChild->firstLineBoxBaseline();
+    int baseline = baselineChild->firstLineBoxBaseline(baselineType);
     if (baseline == -1) {
         // FIXME: We should pass |direction| into firstLineBoxBaseline and stop bailing out if we're a writing mode root.
         // This would also fix some cases where the flexbox is orthogonal to its container.
@@ -168,7 +168,7 @@ int RenderFlexibleBox::firstLineBoxBaseline() const
 
 int RenderFlexibleBox::inlineBlockBaseline(LineDirectionMode direction) const
 {
-    int baseline = firstLineBoxBaseline();
+    int baseline = firstLineBoxBaseline(FontBaselineOrAuto());
     if (baseline != -1)
         return baseline;
 
@@ -680,7 +680,7 @@ bool RenderFlexibleBox::updateAutoMarginsInCrossAxis(RenderBox* child, LayoutUni
 
 LayoutUnit RenderFlexibleBox::marginBoxAscentForChild(RenderBox* child)
 {
-    LayoutUnit ascent = child->firstLineBoxBaseline();
+    LayoutUnit ascent = child->firstLineBoxBaseline(FontBaselineOrAuto());
     if (ascent == -1)
         ascent = crossAxisExtentForChild(child);
     return ascent + flowAwareMarginBeforeForChild(child);