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

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

Issue 2944793002: Make EFlexWrap an enum class. (Closed)
Patch Set: Rebase Created 3 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, 2011 Apple Inc. All 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.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 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 static float InitialFlexShrink() { return 1; } 763 static float InitialFlexShrink() { return 1; }
764 float FlexShrink() const { 764 float FlexShrink() const {
765 return rare_non_inherited_data_->flexible_box_data_->flex_shrink_; 765 return rare_non_inherited_data_->flexible_box_data_->flex_shrink_;
766 } 766 }
767 void SetFlexShrink(float f) { 767 void SetFlexShrink(float f) {
768 SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_shrink_, 768 SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_shrink_,
769 f); 769 f);
770 } 770 }
771 771
772 // flex-wrap (aka -webkit-flex-wrap) 772 // flex-wrap (aka -webkit-flex-wrap)
773 static EFlexWrap InitialFlexWrap() { return kFlexNoWrap; } 773 static EFlexWrap InitialFlexWrap() { return EFlexWrap::kNowrap; }
774 EFlexWrap FlexWrap() const { 774 EFlexWrap FlexWrap() const {
775 return static_cast<EFlexWrap>( 775 return static_cast<EFlexWrap>(
776 rare_non_inherited_data_->flexible_box_data_->flex_wrap_); 776 rare_non_inherited_data_->flexible_box_data_->flex_wrap_);
777 } 777 }
778 void SetFlexWrap(EFlexWrap w) { 778 void SetFlexWrap(EFlexWrap w) {
779 SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_wrap_, w); 779 SET_NESTED_VAR(rare_non_inherited_data_, flexible_box_data_, flex_wrap_,
780 static_cast<unsigned>(w));
780 } 781 }
781 782
782 // -webkit-box-ordinal-group 783 // -webkit-box-ordinal-group
783 static unsigned InitialBoxOrdinalGroup() { return 1; } 784 static unsigned InitialBoxOrdinalGroup() { return 1; }
784 unsigned BoxOrdinalGroup() const { 785 unsigned BoxOrdinalGroup() const {
785 return rare_non_inherited_data_->deprecated_flexible_box_data_ 786 return rare_non_inherited_data_->deprecated_flexible_box_data_
786 ->box_ordinal_group_; 787 ->box_ordinal_group_;
787 } 788 }
788 void SetBoxOrdinalGroup(unsigned og) { 789 void SetBoxOrdinalGroup(unsigned og) {
789 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_, 790 SET_NESTED_VAR(rare_non_inherited_data_, deprecated_flexible_box_data_,
(...skipping 2347 matching lines...) Expand 10 before | Expand all | Expand 10 after
3137 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3138 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3138 } 3139 }
3139 3140
3140 inline bool ComputedStyle::HasPseudoElementStyle() const { 3141 inline bool ComputedStyle::HasPseudoElementStyle() const {
3141 return PseudoBitsInternal() & kElementPseudoIdMask; 3142 return PseudoBitsInternal() & kElementPseudoIdMask;
3142 } 3143 }
3143 3144
3144 } // namespace blink 3145 } // namespace blink
3145 3146
3146 #endif // ComputedStyle_h 3147 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698