OLD | NEW |
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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
491 ContainsLayout = 0x1, | 491 ContainsLayout = 0x1, |
492 ContainsStyle = 0x2, | 492 ContainsStyle = 0x2, |
493 ContainsPaint = 0x4, | 493 ContainsPaint = 0x4, |
494 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint, | 494 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint, |
495 }; | 495 }; |
496 inline Containment operator| (Containment a, Containment b) { return Containment
(int(a) | int(b)); } | 496 inline Containment operator| (Containment a, Containment b) { return Containment
(int(a) | int(b)); } |
497 inline Containment& operator|= (Containment& a, Containment b) { return a = a |
b; } | 497 inline Containment& operator|= (Containment& a, Containment b) { return a = a |
b; } |
498 | 498 |
499 enum ItemPosition { | 499 enum ItemPosition { |
500 ItemPositionAuto, | 500 ItemPositionAuto, |
| 501 ItemPositionNormal, |
501 ItemPositionStretch, | 502 ItemPositionStretch, |
502 ItemPositionBaseline, | 503 ItemPositionBaseline, |
503 ItemPositionLastBaseline, | 504 ItemPositionLastBaseline, |
504 ItemPositionCenter, | 505 ItemPositionCenter, |
505 ItemPositionStart, | 506 ItemPositionStart, |
506 ItemPositionEnd, | 507 ItemPositionEnd, |
507 ItemPositionSelfStart, | 508 ItemPositionSelfStart, |
508 ItemPositionSelfEnd, | 509 ItemPositionSelfEnd, |
509 ItemPositionFlexStart, | 510 ItemPositionFlexStart, |
510 ItemPositionFlexEnd, | 511 ItemPositionFlexEnd, |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
554 | 555 |
555 enum ScrollSnapType { | 556 enum ScrollSnapType { |
556 ScrollSnapTypeNone, | 557 ScrollSnapTypeNone, |
557 ScrollSnapTypeMandatory, | 558 ScrollSnapTypeMandatory, |
558 ScrollSnapTypeProximity | 559 ScrollSnapTypeProximity |
559 }; | 560 }; |
560 | 561 |
561 } // namespace blink | 562 } // namespace blink |
562 | 563 |
563 #endif // ComputedStyleConstants_h | 564 #endif // ComputedStyleConstants_h |
OLD | NEW |