Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/core/rendering/style/GridResolvedPosition.h b/src/third_party/WebKit/Source/core/rendering/style/GridResolvedPosition.h
index 7a959cb..233109b 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/style/GridResolvedPosition.h
+++ b/src/third_party/WebKit/Source/core/rendering/style/GridResolvedPosition.h
@@ -7,7 +7,7 @@
 
 #include "core/rendering/style/GridPosition.h"
 
-namespace WebCore {
+namespace blink {
 
 struct GridSpan;
 class RenderBox;
@@ -43,7 +43,8 @@ public:
         return GridResolvedPosition(resolvedPosition);
     }
 
-    static GridSpan resolveGridPositionsFromAutoPlacementPosition(const RenderBox&, GridTrackSizingDirection, const GridResolvedPosition&);
+    static void initialAndFinalPositionsFromStyle(const RenderStyle&, const RenderBox&, GridTrackSizingDirection, GridPosition &initialPosition, GridPosition &finalPosition);
+    static GridSpan resolveGridPositionsFromAutoPlacementPosition(const RenderStyle&, const RenderBox&, GridTrackSizingDirection, const GridResolvedPosition&);
     static PassOwnPtr<GridSpan> resolveGridPositionsFromStyle(const RenderStyle&, const RenderBox&, GridTrackSizingDirection);
     static GridResolvedPosition resolveNamedGridLinePositionFromStyle(const RenderStyle&, const GridPosition&, GridPositionSide);
     static GridResolvedPosition resolveGridPositionFromStyle(const RenderStyle&, const GridPosition&, GridPositionSide);
@@ -119,6 +120,6 @@ private:
     size_t m_integerPosition;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // GridResolvedPosition_h