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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyleConstants.h

Issue 1709963002: [css-align] New CSS Value 'normal' for Self Alignment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Applied suggested changes. Created 4 years, 9 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
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 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 ContainsLayout = 0x1, 538 ContainsLayout = 0x1,
539 ContainsStyle = 0x2, 539 ContainsStyle = 0x2,
540 ContainsPaint = 0x4, 540 ContainsPaint = 0x4,
541 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint, 541 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint,
542 }; 542 };
543 inline Containment operator| (Containment a, Containment b) { return Containment (int(a) | int(b)); } 543 inline Containment operator| (Containment a, Containment b) { return Containment (int(a) | int(b)); }
544 inline Containment& operator|= (Containment& a, Containment b) { return a = a | b; } 544 inline Containment& operator|= (Containment& a, Containment b) { return a = a | b; }
545 545
546 enum ItemPosition { 546 enum ItemPosition {
547 ItemPositionAuto, 547 ItemPositionAuto,
548 ItemPositionNormal,
548 ItemPositionStretch, 549 ItemPositionStretch,
549 ItemPositionBaseline, 550 ItemPositionBaseline,
550 ItemPositionLastBaseline, 551 ItemPositionLastBaseline,
551 ItemPositionCenter, 552 ItemPositionCenter,
552 ItemPositionStart, 553 ItemPositionStart,
553 ItemPositionEnd, 554 ItemPositionEnd,
554 ItemPositionSelfStart, 555 ItemPositionSelfStart,
555 ItemPositionSelfEnd, 556 ItemPositionSelfEnd,
556 ItemPositionFlexStart, 557 ItemPositionFlexStart,
557 ItemPositionFlexEnd, 558 ItemPositionFlexEnd,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 608
608 enum AutoRepeatType { 609 enum AutoRepeatType {
609 NoAutoRepeat, 610 NoAutoRepeat,
610 AutoFill, 611 AutoFill,
611 AutoFit 612 AutoFit
612 }; 613 };
613 614
614 } // namespace blink 615 } // namespace blink
615 616
616 #endif // ComputedStyleConstants_h 617 #endif // ComputedStyleConstants_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698