[CSS Grid Layout] Fix positioned grid children position and size

Source/core/rendering/RenderBox.cpp

Index: Source/core/rendering/RenderBox.cpp
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp
index 7e63fe333b7890e7e5c48a84f0ad34a67eb493fb..39aa7446283e65d3512b1cc058a489521dce9388 100644
--- a/Source/core/rendering/RenderBox.cpp
+++ b/Source/core/rendering/RenderBox.cpp
@@ -72,6 +72,8 @@ typedef WTF::HashMap<const RenderBox*, LayoutUnit> OverrideSizeMap;
 // FIXME: Move these into RenderBoxRareData.
 static OverrideSizeMap* gOverrideContainingBlockLogicalHeightMap = 0;
 static OverrideSizeMap* gOverrideContainingBlockLogicalWidthMap = 0;
+static OverrideSizeMap* gExtraInlineOffsetMap = 0;
+static OverrideSizeMap* gExtraBlockOffsetMap = 0;
 
 
 // Size of border belt for autoscroll. When mouse pointer in border belt,
@@ -103,6 +105,7 @@ void RenderBox::willBeDestroyed()
 {
     clearOverrideSize();
     clearContainingBlockOverrideSize();
+    clearExtraInlineAndBlockOffests();
 
     RenderBlock::removePercentHeightDescendantIfNeeded(this);
 
@@ -1011,6 +1014,50 @@ void RenderBox::clearOverrideContainingBlockContentLogicalHeight()
         gOverrideContainingBlockLogicalHeightMap->remove(this);
 }
 
+LayoutUnit RenderBox::extraInlineOffset() const
+{
+    ASSERT(hasExtraInlineOffset());
+    return gExtraInlineOffsetMap->get(this);
+}
+
+LayoutUnit RenderBox::extraBlockOffset() const
+{
+    ASSERT(hasExtraBlockOffset());
+    return gExtraBlockOffsetMap->get(this);
+}
+
+bool RenderBox::hasExtraInlineOffset() const
+{
+    return gExtraInlineOffsetMap && gExtraInlineOffsetMap->contains(this);
+}
+
+bool RenderBox::hasExtraBlockOffset() const
+{
+    return gExtraBlockOffsetMap && gExtraBlockOffsetMap->contains(this);
+}
+
+void RenderBox::setExtraInlineOffset(LayoutUnit inlineOffest)
+{
+    if (!gExtraInlineOffsetMap)
+        gExtraInlineOffsetMap = new OverrideSizeMap;
+    gExtraInlineOffsetMap->set(this, inlineOffest);
+}
+
+void RenderBox::setExtraBlockOffset(LayoutUnit blockOffest)
+{
+    if (!gExtraBlockOffsetMap)
+        gExtraBlockOffsetMap = new OverrideSizeMap;
+    gExtraBlockOffsetMap->set(this, blockOffest);
+}
+
+void RenderBox::clearExtraInlineAndBlockOffests()
+{
+    if (gExtraInlineOffsetMap)
+        gExtraInlineOffsetMap->remove(this);
+    if (gExtraBlockOffsetMap)
+        gExtraBlockOffsetMap->remove(this);
+}
+
 LayoutUnit RenderBox::adjustBorderBoxLogicalWidthForBoxSizing(LayoutUnit width) const
 {
     LayoutUnit bordersPlusPadding = borderAndPaddingLogicalWidth();
@@ -2617,6 +2664,9 @@ LayoutUnit RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxMo
         }
     }
 
+    if (hasOverrideContainingBlockLogicalWidth())
+        return overrideContainingBlockContentLogicalWidth();
+
     if (containingBlock->isBox())
         return toRenderBox(containingBlock)->clientLogicalWidth();
 
@@ -2657,6 +2707,9 @@ LayoutUnit RenderBox::containingBlockLogicalHeightForPositioned(const RenderBoxM
         }
     }
 
+    if (hasOverrideContainingBlockLogicalHeight())
+        return overrideContainingBlockContentLogicalHeight();
+
     if (containingBlock->isBox()) {
         const RenderBlock* cb = containingBlock->isRenderBlock() ?
             toRenderBlock(containingBlock) : containingBlock->containingBlock();
@@ -2843,6 +2896,9 @@ void RenderBox::computePositionedLogicalWidth(LogicalExtentComputedValues& compu
         }
     }
 
+    if (containerBlock->isRenderGrid() && !style()->hasStaticInlinePosition(isHorizontal))
+        computedValues.m_position += extraInlineOffset();

[Julien - ping for review, 2014/12/05 00:32:55]

Note that by adding the isRenderGrid() call above, you've made extra*Offset tied
to RenderGrid when it wasn't before. It's not great IMO as we may want to add it
to other renderers and its name doesn't imply that it's a grid concept.

I could live with that but had to mention this :)

[Manuel Rego, 2014/12/05 10:47:08]

Yeah, I agree with you, so I've removed the isRenderGrid() check.
In addition, I've also removed hasExtraInline/BlockOffset()
as it was only used in an ASSERT in extraInline/BlockOffset().

+
     computedValues.m_extent += bordersPlusPadding;
 }
 
@@ -3153,6 +3209,9 @@ void RenderBox::computePositionedLogicalHeight(LogicalExtentComputedValues& comp
         }
     }
 
+    if (containerBlock->isRenderGrid() && !style()->hasStaticBlockPosition(isHorizontalWritingMode()))
+        computedValues.m_position += extraBlockOffset();
+
     // Set final height value.
     computedValues.m_extent += bordersPlusPadding;
 }