Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / style / GridResolvedPosition.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/style/GridResolvedPosition.cpp b/src/third_party/WebKit/Source/core/rendering/style/GridResolvedPosition.cpp
index b537048..919a43c 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/GridResolvedPosition.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/style/GridResolvedPosition.cpp
@@ -8,7 +8,7 @@
 #include "core/rendering/RenderBox.h"
 #include "core/rendering/style/GridCoordinate.h"
 
-namespace WebCore {
+namespace blink {
 
 static const NamedGridLinesMap& gridLinesForSide(const RenderStyle& style, GridPositionSide side)
 {
@@ -94,7 +94,8 @@ PassOwnPtr<GridSpan> GridResolvedPosition::resolveGridPositionsFromStyle(const R
     GridPositionSide finalPositionSide = calculateFinalPositionSide(direction);
 
     if (initialPosition.shouldBeResolvedAgainstOppositePosition() && finalPosition.shouldBeResolvedAgainstOppositePosition()) {
-        if (gridContainerStyle.gridAutoFlow() == AutoFlowNone)
+        // FIXME: Implement properly "stack" value in auto-placement algorithm.
+        if (gridContainerStyle.isGridAutoFlowAlgorithmStack())
             return adoptPtr(new GridSpan(0, 0));
 
         // We can't get our grid positions without running the auto placement algorithm.
@@ -250,4 +251,4 @@ PassOwnPtr<GridSpan> GridResolvedPosition::resolveNamedGridLinePositionAgainstOp
     return GridSpan::createWithNamedSpanAgainstOpposite(resolvedOppositePosition, position, side, it->value);
 }
 
-} // namespace WebCore
+} // namespace blink