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

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

Issue 2635143002: Changed EBoxSizing to an enum class and renamed its members (Closed)
Patch Set: Aded k prefix Created 3 years, 11 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 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 void setBottom(const Length& v) { SET_VAR(m_surround, offset.m_bottom, v); } 751 void setBottom(const Length& v) { SET_VAR(m_surround, offset.m_bottom, v); }
752 752
753 // box-shadow (aka -webkit-box-shadow) 753 // box-shadow (aka -webkit-box-shadow)
754 static ShadowList* initialBoxShadow() { return 0; } 754 static ShadowList* initialBoxShadow() { return 0; }
755 ShadowList* boxShadow() const { 755 ShadowList* boxShadow() const {
756 return m_rareNonInheritedData->m_boxShadow.get(); 756 return m_rareNonInheritedData->m_boxShadow.get();
757 } 757 }
758 void setBoxShadow(PassRefPtr<ShadowList>); 758 void setBoxShadow(PassRefPtr<ShadowList>);
759 759
760 // box-sizing (aka -webkit-box-sizing) 760 // box-sizing (aka -webkit-box-sizing)
761 static EBoxSizing initialBoxSizing() { return BoxSizingContentBox; } 761 static EBoxSizing initialBoxSizing() { return EBoxSizing::kContentBox; }
762 EBoxSizing boxSizing() const { return m_box->boxSizing(); } 762 EBoxSizing boxSizing() const { return m_box->boxSizing(); }
763 void setBoxSizing(EBoxSizing s) { SET_VAR(m_box, m_boxSizing, s); } 763 void setBoxSizing(EBoxSizing s) {
764 SET_VAR(m_box, m_boxSizing, static_cast<unsigned>(s));
765 }
764 766
765 // clear 767 // clear
766 static EClear initialClear() { return ClearNone; } 768 static EClear initialClear() { return ClearNone; }
767 EClear clear() const { 769 EClear clear() const {
768 return static_cast<EClear>(m_nonInheritedData.m_clear); 770 return static_cast<EClear>(m_nonInheritedData.m_clear);
769 } 771 }
770 void setClear(EClear v) { m_nonInheritedData.m_clear = v; } 772 void setClear(EClear v) { m_nonInheritedData.m_clear = v; }
771 773
772 // Page break properties. 774 // Page break properties.
773 // break-after (shorthand for page-break-after and -webkit-column-break-after) 775 // break-after (shorthand for page-break-after and -webkit-column-break-after)
(...skipping 3158 matching lines...) Expand 10 before | Expand all | Expand 10 after
3932 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 3934 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
3933 } 3935 }
3934 3936
3935 inline bool ComputedStyle::hasPseudoElementStyle() const { 3937 inline bool ComputedStyle::hasPseudoElementStyle() const {
3936 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3938 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3937 } 3939 }
3938 3940
3939 } // namespace blink 3941 } // namespace blink
3940 3942
3941 #endif // ComputedStyle_h 3943 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698