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

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: Getting back the FullScreen fix, missed during the rebase. Created 4 years, 4 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 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 ContainsStyle = 0x2, 550 ContainsStyle = 0x2,
551 ContainsPaint = 0x4, 551 ContainsPaint = 0x4,
552 ContainsSize = 0x8, 552 ContainsSize = 0x8,
553 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint | ContainsSi ze, 553 ContainsStrict = ContainsLayout | ContainsStyle | ContainsPaint | ContainsSi ze,
554 ContainsContent = ContainsLayout | ContainsStyle | ContainsPaint, 554 ContainsContent = ContainsLayout | ContainsStyle | ContainsPaint,
555 }; 555 };
556 inline Containment operator| (Containment a, Containment b) { return Containment (int(a) | int(b)); } 556 inline Containment operator| (Containment a, Containment b) { return Containment (int(a) | int(b)); }
557 inline Containment& operator|= (Containment& a, Containment b) { return a = a | b; } 557 inline Containment& operator|= (Containment& a, Containment b) { return a = a | b; }
558 558
559 enum ItemPosition { 559 enum ItemPosition {
560 ItemPositionAuto, 560 ItemPositionAuto, // It will mean 'normal' after running the StyleAdjuster t o avoid resolving the initial values.
561 ItemPositionNormal,
561 ItemPositionStretch, 562 ItemPositionStretch,
562 ItemPositionBaseline, 563 ItemPositionBaseline,
563 ItemPositionLastBaseline, 564 ItemPositionLastBaseline,
564 ItemPositionCenter, 565 ItemPositionCenter,
565 ItemPositionStart, 566 ItemPositionStart,
566 ItemPositionEnd, 567 ItemPositionEnd,
567 ItemPositionSelfStart, 568 ItemPositionSelfStart,
568 ItemPositionSelfEnd, 569 ItemPositionSelfEnd,
569 ItemPositionFlexStart, 570 ItemPositionFlexStart,
570 ItemPositionFlexEnd, 571 ItemPositionFlexEnd,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 621
621 enum AutoRepeatType { 622 enum AutoRepeatType {
622 NoAutoRepeat, 623 NoAutoRepeat,
623 AutoFill, 624 AutoFill,
624 AutoFit 625 AutoFit
625 }; 626 };
626 627
627 } // namespace blink 628 } // namespace blink
628 629
629 #endif // ComputedStyleConstants_h 630 #endif // ComputedStyleConstants_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698