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

Side by Side Diff: Source/core/rendering/style/RenderStyleConstants.h

Issue 131773002: Broaden justify-self's parsing name (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 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 | Annotate | Revision Log
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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 }; 523 };
524 inline TouchAction operator| (TouchAction a, TouchAction b) { return TouchAction (int(a) | int(b)); } 524 inline TouchAction operator| (TouchAction a, TouchAction b) { return TouchAction (int(a) | int(b)); }
525 inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a | b; } 525 inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a | b; }
526 inline TouchAction operator& (TouchAction a, TouchAction b) { return TouchAction (int(a) & int(b)); } 526 inline TouchAction operator& (TouchAction a, TouchAction b) { return TouchAction (int(a) & int(b)); }
527 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a & b; } 527 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a & b; }
528 528
529 enum EIsolation { IsolationAuto, IsolationIsolate }; 529 enum EIsolation { IsolationAuto, IsolationIsolate };
530 530
531 enum TouchActionDelay { TouchActionDelayNone, TouchActionDelayScript }; 531 enum TouchActionDelay { TouchActionDelayNone, TouchActionDelayScript };
532 532
533 enum JustifySelf { 533 enum ItemPosition {
534 JustifySelfAuto, 534 ItemPositionAuto,
535 JustifySelfStretch, 535 ItemPositionStretch,
536 JustifySelfBaseline, 536 ItemPositionBaseline,
537 JustifySelfCenter, 537 ItemPositionCenter,
538 JustifySelfStart, 538 ItemPositionStart,
539 JustifySelfEnd, 539 ItemPositionEnd,
540 JustifySelfSelfStart, 540 ItemPositionSelfStart,
541 JustifySelfSelfEnd, 541 ItemPositionSelfEnd,
542 JustifySelfFlexStart, 542 ItemPositionFlexStart,
543 JustifySelfFlexEnd, 543 ItemPositionFlexEnd,
544 JustifySelfLeft, 544 ItemPositionLeft,
545 JustifySelfRight 545 ItemPositionRight
546 }; 546 };
547 547
548 enum JustifySelfOverflowAlignment { 548 enum OverflowAlignment {
549 JustifySelfOverflowAlignmentDefault, 549 OverflowAlignmentDefault,
550 JustifySelfOverflowAlignmentTrue, 550 OverflowAlignmentTrue,
551 JustifySelfOverflowAlignmentSafe 551 OverflowAlignmentSafe
552 }; 552 };
553 553
554 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows). 554 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows).
555 static const float maximumAllowedFontSize = 1000000.0f; 555 static const float maximumAllowedFontSize = 1000000.0f;
556 556
557 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine }; 557 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine };
558 558
559 enum LayoutBox { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox }; 559 enum LayoutBox { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox };
560 560
561 } // namespace WebCore 561 } // namespace WebCore
562 562
563 #endif // RenderStyleConstants_h 563 #endif // RenderStyleConstants_h
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698