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

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

Issue 2882113002: Make ESpeak an enum class. (Closed)
Patch Set: Created 3 years, 7 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 1744 matching lines...) Expand 10 before | Expand all | Expand 10 after
1755 // line-height-step 1755 // line-height-step
1756 static uint8_t InitialLineHeightStep() { return 0; } 1756 static uint8_t InitialLineHeightStep() { return 0; }
1757 uint8_t LineHeightStep() const { 1757 uint8_t LineHeightStep() const {
1758 return rare_inherited_data_->line_height_step_; 1758 return rare_inherited_data_->line_height_step_;
1759 } 1759 }
1760 void SetLineHeightStep(uint8_t unit) { 1760 void SetLineHeightStep(uint8_t unit) {
1761 SET_VAR(rare_inherited_data_, line_height_step_, unit); 1761 SET_VAR(rare_inherited_data_, line_height_step_, unit);
1762 } 1762 }
1763 1763
1764 // speak 1764 // speak
1765 static ESpeak InitialSpeak() { return kSpeakNormal; } 1765 static ESpeak InitialSpeak() { return ESpeak::kNormal; }
1766 ESpeak Speak() const { 1766 ESpeak Speak() const {
1767 return static_cast<ESpeak>(rare_inherited_data_->speak_); 1767 return static_cast<ESpeak>(rare_inherited_data_->speak_);
1768 } 1768 }
1769 void SetSpeak(ESpeak s) { SET_VAR(rare_inherited_data_, speak_, s); } 1769 void SetSpeak(ESpeak s) {
1770 SET_VAR(rare_inherited_data_, speak_, static_cast<unsigned>(s));
1771 }
1770 1772
1771 // tab-size 1773 // tab-size
1772 static TabSize InitialTabSize() { return TabSize(8); } 1774 static TabSize InitialTabSize() { return TabSize(8); }
1773 TabSize GetTabSize() const { return rare_inherited_data_->tab_size_; } 1775 TabSize GetTabSize() const { return rare_inherited_data_->tab_size_; }
1774 void SetTabSize(TabSize size) { 1776 void SetTabSize(TabSize size) {
1775 SET_VAR(rare_inherited_data_, tab_size_, size); 1777 SET_VAR(rare_inherited_data_, tab_size_, size);
1776 } 1778 }
1777 1779
1778 // text-align-last 1780 // text-align-last
1779 static TextAlignLast InitialTextAlignLast() { return kTextAlignLastAuto; } 1781 static TextAlignLast InitialTextAlignLast() { return kTextAlignLastAuto; }
(...skipping 2041 matching lines...) Expand 10 before | Expand all | Expand 10 after
3821 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3823 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3822 } 3824 }
3823 3825
3824 inline bool ComputedStyle::HasPseudoElementStyle() const { 3826 inline bool ComputedStyle::HasPseudoElementStyle() const {
3825 return PseudoBitsInternal() & kElementPseudoIdMask; 3827 return PseudoBitsInternal() & kElementPseudoIdMask;
3826 } 3828 }
3827 3829
3828 } // namespace blink 3830 } // namespace blink
3829 3831
3830 #endif // ComputedStyle_h 3832 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698