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

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

Issue 134013002: Upgrade align-self and align-items parsing to CSS 3 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Really fix the tests Created 6 years, 11 months 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 | Annotate | Revision Log
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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 enum EBoxPack { Start, Center, End, Justify }; 184 enum EBoxPack { Start, Center, End, Justify };
185 enum EBoxAlignment { BSTRETCH, BSTART, BCENTER, BEND, BBASELINE }; 185 enum EBoxAlignment { BSTRETCH, BSTART, BCENTER, BEND, BBASELINE };
186 enum EBoxOrient { HORIZONTAL, VERTICAL }; 186 enum EBoxOrient { HORIZONTAL, VERTICAL };
187 enum EBoxLines { SINGLE, MULTIPLE }; 187 enum EBoxLines { SINGLE, MULTIPLE };
188 enum EBoxDirection { BNORMAL, BREVERSE }; 188 enum EBoxDirection { BNORMAL, BREVERSE };
189 189
190 // CSS3 Flexbox Properties 190 // CSS3 Flexbox Properties
191 191
192 enum EAlignContent { AlignContentFlexStart, AlignContentFlexEnd, AlignContentCen ter, AlignContentSpaceBetween, AlignContentSpaceAround, AlignContentStretch }; 192 enum EAlignContent { AlignContentFlexStart, AlignContentFlexEnd, AlignContentCen ter, AlignContentSpaceBetween, AlignContentSpaceAround, AlignContentStretch };
193 enum EAlignItems { AlignAuto, AlignFlexStart, AlignFlexEnd, AlignCenter, AlignSt retch, AlignBaseline };
194 enum EFlexDirection { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse }; 193 enum EFlexDirection { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse };
195 enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse }; 194 enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse };
196 enum EJustifyContent { JustifyFlexStart, JustifyFlexEnd, JustifyCenter, JustifyS paceBetween, JustifySpaceAround }; 195 enum EJustifyContent { JustifyFlexStart, JustifyFlexEnd, JustifyCenter, JustifyS paceBetween, JustifySpaceAround };
197 196
198 enum ETextSecurity { 197 enum ETextSecurity {
199 TSNONE, TSDISC, TSCIRCLE, TSSQUARE 198 TSNONE, TSDISC, TSCIRCLE, TSSQUARE
200 }; 199 };
201 200
202 // CSS3 User Modify Properties 201 // CSS3 User Modify Properties
203 202
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows). 555 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows).
557 static const float maximumAllowedFontSize = 1000000.0f; 556 static const float maximumAllowedFontSize = 1000000.0f;
558 557
559 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine }; 558 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine };
560 559
561 enum LayoutBox { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox }; 560 enum LayoutBox { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox };
562 561
563 } // namespace WebCore 562 } // namespace WebCore
564 563
565 #endif // RenderStyleConstants_h 564 #endif // RenderStyleConstants_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698