third_party/WebKit/Source/core/style/GridResolvedPosition.h - Issue 1477203002: [css-grid] Simplify GridResolvedPosition interface

Unified Diff: third_party/WebKit/Source/core/style/GridResolvedPosition.h

Issue 1477203002: [css-grid] Simplify GridResolvedPosition interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/style/GridCoordinate.h ('k') | third_party/WebKit/Source/core/style/GridResolvedPosition.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/style/GridResolvedPosition.h

diff --git a/third_party/WebKit/Source/core/style/GridResolvedPosition.h b/third_party/WebKit/Source/core/style/GridResolvedPosition.h

index 4fbcab0941151277031c0e7bcc799b4beacc3bb3..add326d5be4e593fadf9069bce728081c3f0cdd4 100644

--- a/third_party/WebKit/Source/core/style/GridResolvedPosition.h

+++ b/third_party/WebKit/Source/core/style/GridResolvedPosition.h

@@ -32,17 +32,6 @@ class GridResolvedPosition {

DISALLOW_NEW();

public:

- static bool isValidNamedLineOrArea(const String& lineName, const ComputedStyle&, GridPositionSide);

- static GridPositionSide initialPositionSide(GridTrackSizingDirection);

- static GridPositionSide finalPositionSide(GridTrackSizingDirection);

- static void initialAndFinalPositionsFromStyle(const ComputedStyle&, const LayoutBox&, GridTrackSizingDirection, GridPosition &initialPosition, GridPosition &finalPosition);

- static GridSpan resolveGridPositionsFromAutoPlacementPosition(const ComputedStyle&, const LayoutBox&, GridTrackSizingDirection, const GridResolvedPosition&);

- static GridSpan resolveGridPositionsFromStyle(const ComputedStyle&, const LayoutBox&, GridTrackSizingDirection);

- static GridResolvedPosition resolveNamedGridLinePositionFromStyle(const ComputedStyle&, const GridPosition&, GridPositionSide);

- static GridResolvedPosition resolveGridPositionFromStyle(const ComputedStyle&, const GridPosition&, GridPositionSide);

- static GridSpan resolveGridPositionAgainstOppositePosition(const ComputedStyle&, const GridResolvedPosition& resolvedOppositePosition, const GridPosition&, GridPositionSide);

- static GridSpan resolveNamedGridLinePositionAgainstOppositePosition(const ComputedStyle&, const GridResolvedPosition& resolvedOppositePosition, const GridPosition&, GridPositionSide);

GridResolvedPosition(size_t position)

: m_integerPosition(position)

{

@@ -107,9 +96,15 @@ public:

static size_t explicitGridColumnCount(const ComputedStyle&);

static size_t explicitGridRowCount(const ComputedStyle&);

-private:

+ static bool isValidNamedLineOrArea(const String& lineName, const ComputedStyle&, GridPositionSide);

- static size_t explicitGridSizeForSide(const ComputedStyle&, GridPositionSide);

+ static GridPositionSide initialPositionSide(GridTrackSizingDirection);

+ static GridPositionSide finalPositionSide(GridTrackSizingDirection);

+ static GridSpan resolveGridPositionsFromAutoPlacementPosition(const ComputedStyle&, const LayoutBox&, GridTrackSizingDirection, const GridResolvedPosition&);

+ static GridSpan resolveGridPositionsFromStyle(const ComputedStyle&, const LayoutBox&, GridTrackSizingDirection);

+private:

size_t m_integerPosition;

};