| Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h
|
| index 6acba7836bc61f342b930d32bc16dcd29cacf68e..3a8973bd253e60598f6a84f984e5f03d09dc05d2 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.h
|
| @@ -95,9 +95,10 @@ class StyleBuilderConverter {
|
| static StyleSelfAlignmentData convertSelfOrDefaultAlignmentData(
|
| StyleResolverState&,
|
| const CSSValue&);
|
| - static StyleContentAlignmentData convertContentAlignmentData(
|
| - StyleResolverState&,
|
| - const CSSValue&);
|
| + static StyleContentAlignmentData convertAlignContent(StyleResolverState&,
|
| + const CSSValue&);
|
| + static StyleContentAlignmentData convertJustifyContent(StyleResolverState&,
|
| + const CSSValue&);
|
| static GridAutoFlow convertGridAutoFlow(StyleResolverState&, const CSSValue&);
|
| static GridPosition convertGridPosition(StyleResolverState&, const CSSValue&);
|
| static GridTrackSize convertGridTrackSize(StyleResolverState&,
|
|
|