[css-grid] Implementation of Baseline Self-Alignment

third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
index 57a5aa11f641632a5b678a064782f06370c959f0..4301af8b41fae899b9e1ac5fb1d0121622ff8c74 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
@@ -2522,7 +2522,7 @@ int LayoutBlockFlow::lineCount(const RootInlineBox* stopRootInlineBox) const {
 }
 
 int LayoutBlockFlow::firstLineBoxBaseline() const {
-  if (isWritingModeRoot() && !isRubyRun())
+  if (isWritingModeRoot() && !isRubyRun() && !isGridItem())
     return -1;
   if (!childrenInline())
     return LayoutBlock::firstLineBoxBaseline();
@@ -2531,7 +2531,9 @@ int LayoutBlockFlow::firstLineBoxBaseline() const {
     DCHECK(fontData);
     if (!fontData)
       return -1;
-    return (firstLineBox()->logicalTop() +
+    return ((styleRef().isFlippedLinesWritingMode()
+                 ? logicalHeight() - firstLineBox()->logicalBottom()
+                 : firstLineBox()->logicalTop()) +

[svillar, 2017/01/19 09:41:25]

I don't fully understand this change but it does require non-grid tests for
sure.

[jfernandez, 2017/01/19 16:31:48]

I can add more tests, indeed, since this line fixes as well the flexbox bug
#663355 and probably some other cases as well. I can define some layout tests in
fast/writing-mode folder touching different layout models. 

However, bear in mind that I'm using inline-block as reference test, so in a way
these lines are indeed being tested. 

             fontData->getFontMetrics().ascent(firstRootBox()->baselineType()))
         .toInt();
   }