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

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

Issue 2845773002: Make TextDecoration an enum class. (Closed)
Patch Set: Rebase 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 1519 matching lines...) Expand 10 before | Expand all | Expand 10 after
1530 } 1530 }
1531 void SetPageSize(const FloatSize& s) { 1531 void SetPageSize(const FloatSize& s) {
1532 SET_VAR(rare_non_inherited_data_, page_size_, s); 1532 SET_VAR(rare_non_inherited_data_, page_size_, s);
1533 } 1533 }
1534 void SetPageSizeType(PageSizeType t) { 1534 void SetPageSizeType(PageSizeType t) {
1535 SET_VAR(rare_non_inherited_data_, page_size_type_, t); 1535 SET_VAR(rare_non_inherited_data_, page_size_type_, t);
1536 } 1536 }
1537 1537
1538 // Text decoration properties. 1538 // Text decoration properties.
1539 // text-decoration-line 1539 // text-decoration-line
1540 static TextDecoration InitialTextDecoration() { return kTextDecorationNone; } 1540 static TextDecoration InitialTextDecoration() {
1541 return TextDecoration::kNone;
1542 }
1541 TextDecoration GetTextDecoration() const { 1543 TextDecoration GetTextDecoration() const {
1542 return static_cast<TextDecoration>(visual_data_->text_decoration_); 1544 return static_cast<TextDecoration>(visual_data_->text_decoration_);
1543 } 1545 }
1544 void SetTextDecoration(TextDecoration v) { 1546 void SetTextDecoration(TextDecoration v) {
1545 SET_VAR(visual_data_, text_decoration_, v); 1547 SET_VAR(visual_data_, text_decoration_, static_cast<unsigned>(v));
1546 } 1548 }
1547 1549
1548 // text-decoration-color 1550 // text-decoration-color
1549 void SetTextDecorationColor(const StyleColor& c) { 1551 void SetTextDecorationColor(const StyleColor& c) {
1550 SET_VAR(rare_non_inherited_data_, text_decoration_color_, c); 1552 SET_VAR(rare_non_inherited_data_, text_decoration_color_, c);
1551 } 1553 }
1552 1554
1553 // text-decoration-style 1555 // text-decoration-style
1554 static TextDecorationStyle InitialTextDecorationStyle() { 1556 static TextDecorationStyle InitialTextDecorationStyle() {
1555 return kTextDecorationStyleSolid; 1557 return kTextDecorationStyleSolid;
(...skipping 2263 matching lines...) Expand 10 before | Expand all | Expand 10 after
3819 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3821 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3820 } 3822 }
3821 3823
3822 inline bool ComputedStyle::HasPseudoElementStyle() const { 3824 inline bool ComputedStyle::HasPseudoElementStyle() const {
3823 return PseudoBitsInternal() & kElementPseudoIdMask; 3825 return PseudoBitsInternal() & kElementPseudoIdMask;
3824 } 3826 }
3825 3827
3826 } // namespace blink 3828 } // namespace blink
3827 3829
3828 #endif // ComputedStyle_h 3830 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/AppliedTextDecoration.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698