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

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

Issue 2845773002: Make TextDecoration an enum class. (Closed)
Patch Set: Address comments Created 3 years, 8 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 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after
1488 } 1488 }
1489 void SetPageSize(const FloatSize& s) { 1489 void SetPageSize(const FloatSize& s) {
1490 SET_VAR(rare_non_inherited_data_, page_size_, s); 1490 SET_VAR(rare_non_inherited_data_, page_size_, s);
1491 } 1491 }
1492 void SetPageSizeType(PageSizeType t) { 1492 void SetPageSizeType(PageSizeType t) {
1493 SET_VAR(rare_non_inherited_data_, page_size_type_, t); 1493 SET_VAR(rare_non_inherited_data_, page_size_type_, t);
1494 } 1494 }
1495 1495
1496 // Text decoration properties. 1496 // Text decoration properties.
1497 // text-decoration-line 1497 // text-decoration-line
1498 static TextDecoration InitialTextDecoration() { return kTextDecorationNone; } 1498 static TextDecoration InitialTextDecoration() {
1499 return TextDecoration::kNone;
1500 }
1499 TextDecoration GetTextDecoration() const { 1501 TextDecoration GetTextDecoration() const {
1500 return static_cast<TextDecoration>(visual_data_->text_decoration); 1502 return static_cast<TextDecoration>(visual_data_->text_decoration);
1501 } 1503 }
1502 void SetTextDecoration(TextDecoration v) { 1504 void SetTextDecoration(TextDecoration v) {
1503 SET_VAR(visual_data_, text_decoration, v); 1505 SET_VAR(visual_data_, text_decoration, static_cast<unsigned>(v));
Bugs Nash 2017/04/27 00:53:54 as above, I would store this as a TextDecoration o
shend 2017/04/27 01:09:17 Same reasoning as above, we need to pack text_deco
1504 } 1506 }
1505 1507
1506 // text-decoration-color 1508 // text-decoration-color
1507 void SetTextDecorationColor(const StyleColor& c) { 1509 void SetTextDecorationColor(const StyleColor& c) {
1508 SET_VAR(rare_non_inherited_data_, text_decoration_color_, c); 1510 SET_VAR(rare_non_inherited_data_, text_decoration_color_, c);
1509 } 1511 }
1510 1512
1511 // text-decoration-style 1513 // text-decoration-style
1512 static TextDecorationStyle InitialTextDecorationStyle() { 1514 static TextDecorationStyle InitialTextDecorationStyle() {
1513 return kTextDecorationStyleSolid; 1515 return kTextDecorationStyleSolid;
(...skipping 2176 matching lines...) Expand 10 before | Expand all | Expand 10 after
3690 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3692 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3691 } 3693 }
3692 3694
3693 inline bool ComputedStyle::HasPseudoElementStyle() const { 3695 inline bool ComputedStyle::HasPseudoElementStyle() const {
3694 return PseudoBitsInternal() & kElementPseudoIdMask; 3696 return PseudoBitsInternal() & kElementPseudoIdMask;
3695 } 3697 }
3696 3698
3697 } // namespace blink 3699 } // namespace blink
3698 3700
3699 #endif // ComputedStyle_h 3701 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698