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

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

Issue 17090005: [CSS Grid Layout] Implement 'justify-self' parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed a bug in parseColor uncovered by the patch 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 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 }; 524 };
525 inline TouchAction operator| (TouchAction a, TouchAction b) { return TouchAction (int(a) | int(b)); } 525 inline TouchAction operator| (TouchAction a, TouchAction b) { return TouchAction (int(a) | int(b)); }
526 inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a | b; } 526 inline TouchAction& operator|= (TouchAction& a, TouchAction b) { return a = a | b; }
527 inline TouchAction operator& (TouchAction a, TouchAction b) { return TouchAction (int(a) & int(b)); } 527 inline TouchAction operator& (TouchAction a, TouchAction b) { return TouchAction (int(a) & int(b)); }
528 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a & b; } 528 inline TouchAction& operator&= (TouchAction& a, TouchAction b) { return a = a & b; }
529 529
530 enum EIsolation { IsolationAuto, IsolationIsolate }; 530 enum EIsolation { IsolationAuto, IsolationIsolate };
531 531
532 enum TouchActionDelay { TouchActionDelayNone, TouchActionDelayScript }; 532 enum TouchActionDelay { TouchActionDelayNone, TouchActionDelayScript };
533 533
534 enum JustifySelf {
535 JustifySelfAuto,
536 JustifySelfStretch,
537 JustifySelfBaseline,
538 JustifySelfCenter,
539 JustifySelfStart,
540 JustifySelfEnd,
541 JustifySelfSelfStart,
542 JustifySelfSelfEnd,
543 JustifySelfFlexStart,
544 JustifySelfFlexEnd,
545 JustifySelfLeft,
546 JustifySelfRight
547 };
548
549 enum JustifySelfOverflowAlignment {
550 JustifySelfOverflowAlignmentDefault,
551 JustifySelfOverflowAlignmentTrue,
552 JustifySelfOverflowAlignmentSafe
553 };
554
534 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows). 555 // Reasonable maximum to prevent insane font sizes from causing crashes on some platforms (such as Windows).
535 static const float maximumAllowedFontSize = 1000000.0f; 556 static const float maximumAllowedFontSize = 1000000.0f;
536 557
537 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine }; 558 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine };
538 559
539 enum LayoutBox { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox }; 560 enum LayoutBox { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox };
540 561
541 } // namespace WebCore 562 } // namespace WebCore
542 563
543 #endif // RenderStyleConstants_h 564 #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