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

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: Fixed repaint tests. Created 4 years, 6 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 528 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 ContainsStyle = 0x2, 539 ContainsStyle = 0x2,
540 ContainsPaint = 0x4, 540 ContainsPaint = 0x4,
541 ContainsSize = 0x8, 541 ContainsSize = 0x8,
542 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint | ContainsSi ze, 542 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint | ContainsSi ze,
543 ContainsContent = ContainsLayout | ContainsStyle | ContainsPaint, 543 ContainsContent = ContainsLayout | ContainsStyle | ContainsPaint,
544 }; 544 };
545 inline Containment operator| (Containment a, Containment b) { return Containment (int(a) | int(b)); } 545 inline Containment operator| (Containment a, Containment b) { return Containment (int(a) | int(b)); }
546 inline Containment& operator|= (Containment& a, Containment b) { return a = a | b; } 546 inline Containment& operator|= (Containment& a, Containment b) { return a = a | b; }
547 547
548 enum ItemPosition { 548 enum ItemPosition {
549 ItemPositionAuto, 549 ItemPositionAuto, // It will mean 'normal' after running the StyleAdjuster t o avoid resolving the initial values.
550 ItemPositionNormal,
550 ItemPositionStretch, 551 ItemPositionStretch,
551 ItemPositionBaseline, 552 ItemPositionBaseline,
552 ItemPositionLastBaseline, 553 ItemPositionLastBaseline,
553 ItemPositionCenter, 554 ItemPositionCenter,
554 ItemPositionStart, 555 ItemPositionStart,
555 ItemPositionEnd, 556 ItemPositionEnd,
556 ItemPositionSelfStart, 557 ItemPositionSelfStart,
557 ItemPositionSelfEnd, 558 ItemPositionSelfEnd,
558 ItemPositionFlexStart, 559 ItemPositionFlexStart,
559 ItemPositionFlexEnd, 560 ItemPositionFlexEnd,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 610
610 enum AutoRepeatType { 611 enum AutoRepeatType {
611 NoAutoRepeat, 612 NoAutoRepeat,
612 AutoFill, 613 AutoFill,
613 AutoFit 614 AutoFit
614 }; 615 };
615 616
616 } // namespace blink 617 } // namespace blink
617 618
618 #endif // ComputedStyleConstants_h 619 #endif // ComputedStyleConstants_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698