Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: Source/core/rendering/style/RenderStyleConstants.h

Issue 636993002: [CSS Grid Layout] Upgrade justify-content parsing to CSS3 Box Alignment spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebaseline some tests expectations. Created 6 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 enum EBoxAlignment { BSTRETCH, BSTART, BCENTER, BEND, BBASELINE }; 163 enum EBoxAlignment { BSTRETCH, BSTART, BCENTER, BEND, BBASELINE };
164 enum EBoxOrient { HORIZONTAL, VERTICAL }; 164 enum EBoxOrient { HORIZONTAL, VERTICAL };
165 enum EBoxLines { SINGLE, MULTIPLE }; 165 enum EBoxLines { SINGLE, MULTIPLE };
166 enum EBoxDirection { BNORMAL, BREVERSE }; 166 enum EBoxDirection { BNORMAL, BREVERSE };
167 167
168 // CSS3 Flexbox Properties 168 // CSS3 Flexbox Properties
169 169
170 enum EAlignContent { AlignContentFlexStart, AlignContentFlexEnd, AlignContentCen ter, AlignContentSpaceBetween, AlignContentSpaceAround, AlignContentStretch }; 170 enum EAlignContent { AlignContentFlexStart, AlignContentFlexEnd, AlignContentCen ter, AlignContentSpaceBetween, AlignContentSpaceAround, AlignContentStretch };
171 enum EFlexDirection { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse }; 171 enum EFlexDirection { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse };
172 enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse }; 172 enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse };
173 enum EJustifyContent { JustifyFlexStart, JustifyFlexEnd, JustifyCenter, JustifyS paceBetween, JustifySpaceAround };
174 173
175 enum ETextSecurity { 174 enum ETextSecurity {
176 TSNONE, TSDISC, TSCIRCLE, TSSQUARE 175 TSNONE, TSDISC, TSCIRCLE, TSSQUARE
177 }; 176 };
178 177
179 // CSS3 User Modify Properties 178 // CSS3 User Modify Properties
180 179
181 enum EUserModify { 180 enum EUserModify {
182 READ_ONLY, READ_WRITE, READ_WRITE_PLAINTEXT_ONLY 181 READ_ONLY, READ_WRITE, READ_WRITE_PLAINTEXT_ONLY
183 }; 182 };
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 OverflowAlignmentDefault, 534 OverflowAlignmentDefault,
536 OverflowAlignmentTrue, 535 OverflowAlignmentTrue,
537 OverflowAlignmentSafe 536 OverflowAlignmentSafe
538 }; 537 };
539 538
540 enum ItemPositionType { 539 enum ItemPositionType {
541 NonLegacyPosition, 540 NonLegacyPosition,
542 LegacyPosition 541 LegacyPosition
543 }; 542 };
544 543
544 enum ContentPosition {
545 ContentPositionAuto,
546 ContentPositionBaseline,
547 ContentPositionLastBaseline,
548 ContentPositionCenter,
549 ContentPositionStart,
550 ContentPositionEnd,
551 ContentPositionFlexStart,
552 ContentPositionFlexEnd,
553 ContentPositionLeft,
554 ContentPositionRight
555 };
556
557 enum ContentDistributionType {
558 ContentDistributionDefault,
559 ContentDistributionSpaceBetween,
560 ContentDistributionSpaceAround,
561 ContentDistributionSpaceEvenly,
562 ContentDistributionStretch
563 };
564
545 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows). 565 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows).
546 static const float maximumAllowedFontSize = 1000000.0f; 566 static const float maximumAllowedFontSize = 1000000.0f;
547 567
548 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine }; 568 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine };
549 enum TextIndentType { TextIndentNormal, TextIndentHanging }; 569 enum TextIndentType { TextIndentNormal, TextIndentHanging };
550 570
551 enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox } ; 571 enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox } ;
552 572
553 } // namespace blink 573 } // namespace blink
554 574
555 #endif // RenderStyleConstants_h 575 #endif // RenderStyleConstants_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698