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

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

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase Created 3 years, 9 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 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 SET_VAR(m_rareNonInheritedData, m_contain, contain); 844 SET_VAR(m_rareNonInheritedData, m_contain, contain);
845 } 845 }
846 846
847 // content 847 // content
848 ContentData* contentData() const { 848 ContentData* contentData() const {
849 return m_rareNonInheritedData->m_content.get(); 849 return m_rareNonInheritedData->m_content.get();
850 } 850 }
851 void setContent(ContentData*); 851 void setContent(ContentData*);
852 852
853 // display 853 // display
854 static EDisplay initialDisplay() { return EDisplay::Inline; } 854 static EDisplay initialDisplay() { return EDisplay::kInline; }
855 EDisplay display() const { 855 EDisplay display() const {
856 return static_cast<EDisplay>(m_nonInheritedData.m_effectiveDisplay); 856 return static_cast<EDisplay>(m_nonInheritedData.m_effectiveDisplay);
857 } 857 }
858 EDisplay originalDisplay() const { 858 EDisplay originalDisplay() const {
859 return static_cast<EDisplay>(m_nonInheritedData.m_originalDisplay); 859 return static_cast<EDisplay>(m_nonInheritedData.m_originalDisplay);
860 } 860 }
861 void setDisplay(EDisplay v) { 861 void setDisplay(EDisplay v) {
862 m_nonInheritedData.m_effectiveDisplay = static_cast<unsigned>(v); 862 m_nonInheritedData.m_effectiveDisplay = static_cast<unsigned>(v);
863 } 863 }
864 void setOriginalDisplay(EDisplay v) { 864 void setOriginalDisplay(EDisplay v) {
(...skipping 2698 matching lines...) Expand 10 before | Expand all | Expand 10 after
3563 void setVisitedLinkTextStrokeColor(const StyleColor& v) { 3563 void setVisitedLinkTextStrokeColor(const StyleColor& v) {
3564 SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextStrokeColor, 3564 SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkTextStrokeColor,
3565 setVisitedLinkTextStrokeColor, v); 3565 setVisitedLinkTextStrokeColor, v);
3566 } 3566 }
3567 void setVisitedLinkCaretColor(const StyleAutoColor& v) { 3567 void setVisitedLinkCaretColor(const StyleAutoColor& v) {
3568 SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkCaretColor, 3568 SET_VAR_WITH_SETTER(m_rareInheritedData, visitedLinkCaretColor,
3569 setVisitedLinkCaretColor, v); 3569 setVisitedLinkCaretColor, v);
3570 } 3570 }
3571 3571
3572 static bool isDisplayBlockContainer(EDisplay display) { 3572 static bool isDisplayBlockContainer(EDisplay display) {
3573 return display == EDisplay::Block || display == EDisplay::ListItem || 3573 return display == EDisplay::kBlock || display == EDisplay::kListItem ||
3574 display == EDisplay::InlineBlock || display == EDisplay::FlowRoot || 3574 display == EDisplay::kInlineBlock ||
3575 display == EDisplay::TableCell || display == EDisplay::TableCaption; 3575 display == EDisplay::kFlowRoot || display == EDisplay::kTableCell ||
3576 display == EDisplay::kTableCaption;
3576 } 3577 }
3577 3578
3578 static bool isDisplayFlexibleBox(EDisplay display) { 3579 static bool isDisplayFlexibleBox(EDisplay display) {
3579 return display == EDisplay::Flex || display == EDisplay::InlineFlex; 3580 return display == EDisplay::kFlex || display == EDisplay::kInlineFlex;
3580 } 3581 }
3581 3582
3582 static bool isDisplayGridBox(EDisplay display) { 3583 static bool isDisplayGridBox(EDisplay display) {
3583 return display == EDisplay::Grid || display == EDisplay::InlineGrid; 3584 return display == EDisplay::kGrid || display == EDisplay::kInlineGrid;
3584 } 3585 }
3585 3586
3586 static bool isDisplayReplacedType(EDisplay display) { 3587 static bool isDisplayReplacedType(EDisplay display) {
3587 return display == EDisplay::InlineBlock || 3588 return display == EDisplay::kInlineBlock ||
3588 display == EDisplay::WebkitInlineBox || 3589 display == EDisplay::kWebkitInlineBox ||
3589 display == EDisplay::InlineFlex || 3590 display == EDisplay::kInlineFlex ||
3590 display == EDisplay::InlineTable || display == EDisplay::InlineGrid; 3591 display == EDisplay::kInlineTable ||
3592 display == EDisplay::kInlineGrid;
3591 } 3593 }
3592 3594
3593 static bool isDisplayInlineType(EDisplay display) { 3595 static bool isDisplayInlineType(EDisplay display) {
3594 return display == EDisplay::Inline || isDisplayReplacedType(display); 3596 return display == EDisplay::kInline || isDisplayReplacedType(display);
3595 } 3597 }
3596 3598
3597 static bool isDisplayTableType(EDisplay display) { 3599 static bool isDisplayTableType(EDisplay display) {
3598 return display == EDisplay::Table || display == EDisplay::InlineTable || 3600 return display == EDisplay::kTable || display == EDisplay::kInlineTable ||
3599 display == EDisplay::TableRowGroup || 3601 display == EDisplay::kTableRowGroup ||
3600 display == EDisplay::TableHeaderGroup || 3602 display == EDisplay::kTableHeaderGroup ||
3601 display == EDisplay::TableFooterGroup || 3603 display == EDisplay::kTableFooterGroup ||
3602 display == EDisplay::TableRow || 3604 display == EDisplay::kTableRow ||
3603 display == EDisplay::TableColumnGroup || 3605 display == EDisplay::kTableColumnGroup ||
3604 display == EDisplay::TableColumn || display == EDisplay::TableCell || 3606 display == EDisplay::kTableColumn ||
3605 display == EDisplay::TableCaption; 3607 display == EDisplay::kTableCell ||
3608 display == EDisplay::kTableCaption;
3606 } 3609 }
3607 3610
3608 // Color accessors are all private to make sure callers use 3611 // Color accessors are all private to make sure callers use
3609 // visitedDependentColor instead to access them. 3612 // visitedDependentColor instead to access them.
3610 StyleColor borderLeftColor() const { 3613 StyleColor borderLeftColor() const {
3611 return m_surround->border.left().color(); 3614 return m_surround->border.left().color();
3612 } 3615 }
3613 StyleColor borderRightColor() const { 3616 StyleColor borderRightColor() const {
3614 return m_surround->border.right().color(); 3617 return m_surround->border.right().color();
3615 } 3618 }
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
3797 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId); 3800 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId);
3798 } 3801 }
3799 3802
3800 inline bool ComputedStyle::hasPseudoElementStyle() const { 3803 inline bool ComputedStyle::hasPseudoElementStyle() const {
3801 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3804 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3802 } 3805 }
3803 3806
3804 } // namespace blink 3807 } // namespace blink
3805 3808
3806 #endif // ComputedStyle_h 3809 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698