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 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
505 ContainsLayout = 0x1, | 505 ContainsLayout = 0x1, |
506 ContainsStyle = 0x2, | 506 ContainsStyle = 0x2, |
507 ContainsPaint = 0x4, | 507 ContainsPaint = 0x4, |
508 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint, | 508 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint, |
509 }; | 509 }; |
510 inline Containment operator| (Containment a, Containment b) { return Containment
(int(a) | int(b)); } | 510 inline Containment operator| (Containment a, Containment b) { return Containment
(int(a) | int(b)); } |
511 inline Containment& operator|= (Containment& a, Containment b) { return a = a |
b; } | 511 inline Containment& operator|= (Containment& a, Containment b) { return a = a |
b; } |
512 | 512 |
513 enum ItemPosition { | 513 enum ItemPosition { |
514 ItemPositionAuto, | 514 ItemPositionAuto, |
| 515 ItemPositionNormal, |
515 ItemPositionStretch, | 516 ItemPositionStretch, |
516 ItemPositionBaseline, | 517 ItemPositionBaseline, |
517 ItemPositionLastBaseline, | 518 ItemPositionLastBaseline, |
518 ItemPositionCenter, | 519 ItemPositionCenter, |
519 ItemPositionStart, | 520 ItemPositionStart, |
520 ItemPositionEnd, | 521 ItemPositionEnd, |
521 ItemPositionSelfStart, | 522 ItemPositionSelfStart, |
522 ItemPositionSelfEnd, | 523 ItemPositionSelfEnd, |
523 ItemPositionFlexStart, | 524 ItemPositionFlexStart, |
524 ItemPositionFlexEnd, | 525 ItemPositionFlexEnd, |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 | 569 |
569 enum ScrollSnapType { | 570 enum ScrollSnapType { |
570 ScrollSnapTypeNone, | 571 ScrollSnapTypeNone, |
571 ScrollSnapTypeMandatory, | 572 ScrollSnapTypeMandatory, |
572 ScrollSnapTypeProximity | 573 ScrollSnapTypeProximity |
573 }; | 574 }; |
574 | 575 |
575 } // namespace blink | 576 } // namespace blink |
576 | 577 |
577 #endif // ComputedStyleConstants_h | 578 #endif // ComputedStyleConstants_h |
OLD | NEW |