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

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

Issue 2913703002: Make TextAlignLast an enum class. (Closed)
Patch Set: make enum class 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 1684 matching lines...) Expand 10 before | Expand all | Expand 10 after
1695 // speak 1695 // speak
1696 static ESpeak InitialSpeak() { return ESpeak::kNormal; } 1696 static ESpeak InitialSpeak() { return ESpeak::kNormal; }
1697 ESpeak Speak() const { 1697 ESpeak Speak() const {
1698 return static_cast<ESpeak>(rare_inherited_data_->speak_); 1698 return static_cast<ESpeak>(rare_inherited_data_->speak_);
1699 } 1699 }
1700 void SetSpeak(ESpeak s) { 1700 void SetSpeak(ESpeak s) {
1701 SET_VAR(rare_inherited_data_, speak_, static_cast<unsigned>(s)); 1701 SET_VAR(rare_inherited_data_, speak_, static_cast<unsigned>(s));
1702 } 1702 }
1703 1703
1704 // text-align-last 1704 // text-align-last
1705 static TextAlignLast InitialTextAlignLast() { return kTextAlignLastAuto; } 1705 static TextAlignLast InitialTextAlignLast() { return TextAlignLast::kAuto; }
1706 TextAlignLast GetTextAlignLast() const { 1706 TextAlignLast GetTextAlignLast() const {
1707 return static_cast<TextAlignLast>(rare_inherited_data_->text_align_last_); 1707 return static_cast<TextAlignLast>(rare_inherited_data_->text_align_last_);
1708 } 1708 }
1709 void SetTextAlignLast(TextAlignLast v) { 1709 void SetTextAlignLast(TextAlignLast v) {
1710 SET_VAR(rare_inherited_data_, text_align_last_, v); 1710 SET_VAR(rare_inherited_data_, text_align_last_, static_cast<unsigned>(v));
1711 } 1711 }
1712 1712
1713 // text-combine-upright (aka -webkit-text-combine, -epub-text-combine) 1713 // text-combine-upright (aka -webkit-text-combine, -epub-text-combine)
1714 static TextCombine InitialTextCombine() { return kTextCombineNone; } 1714 static TextCombine InitialTextCombine() { return kTextCombineNone; }
1715 TextCombine GetTextCombine() const { 1715 TextCombine GetTextCombine() const {
1716 return static_cast<TextCombine>(rare_inherited_data_->text_combine_); 1716 return static_cast<TextCombine>(rare_inherited_data_->text_combine_);
1717 } 1717 }
1718 void SetTextCombine(TextCombine v) { 1718 void SetTextCombine(TextCombine v) {
1719 SET_VAR(rare_inherited_data_, text_combine_, v); 1719 SET_VAR(rare_inherited_data_, text_combine_, v);
1720 } 1720 }
(...skipping 2085 matching lines...) Expand 10 before | Expand all | Expand 10 after
3806 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3806 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3807 } 3807 }
3808 3808
3809 inline bool ComputedStyle::HasPseudoElementStyle() const { 3809 inline bool ComputedStyle::HasPseudoElementStyle() const {
3810 return PseudoBitsInternal() & kElementPseudoIdMask; 3810 return PseudoBitsInternal() & kElementPseudoIdMask;
3811 } 3811 }
3812 3812
3813 } // namespace blink 3813 } // namespace blink
3814 3814
3815 #endif // ComputedStyle_h 3815 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698