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

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

Issue 2677033002: Remove BreakAlways from EBreak enum (Closed)
Patch Set: Created 3 years, 10 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 748 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 SET_VAR(m_box, m_boxSizing, static_cast<unsigned>(s)); 759 SET_VAR(m_box, m_boxSizing, static_cast<unsigned>(s));
760 } 760 }
761 761
762 // Page break properties. 762 // Page break properties.
763 // break-after (shorthand for page-break-after and -webkit-column-break-after) 763 // break-after (shorthand for page-break-after and -webkit-column-break-after)
764 static EBreak initialBreakAfter() { return BreakAuto; } 764 static EBreak initialBreakAfter() { return BreakAuto; }
765 EBreak breakAfter() const { 765 EBreak breakAfter() const {
766 return static_cast<EBreak>(m_nonInheritedData.m_breakAfter); 766 return static_cast<EBreak>(m_nonInheritedData.m_breakAfter);
767 } 767 }
768 void setBreakAfter(EBreak b) { 768 void setBreakAfter(EBreak b) {
769 DCHECK_LE(b, BreakValueLastAllowedForBreakAfterAndBefore);
770 m_nonInheritedData.m_breakAfter = b; 769 m_nonInheritedData.m_breakAfter = b;
771 } 770 }
772 771
773 // break-before (shorthand for page-break-before and 772 // break-before (shorthand for page-break-before and
774 // -webkit-column-break-before) 773 // -webkit-column-break-before)
775 static EBreak initialBreakBefore() { return BreakAuto; } 774 static EBreak initialBreakBefore() { return BreakAuto; }
776 EBreak breakBefore() const { 775 EBreak breakBefore() const {
777 return static_cast<EBreak>(m_nonInheritedData.m_breakBefore); 776 return static_cast<EBreak>(m_nonInheritedData.m_breakBefore);
778 } 777 }
779 void setBreakBefore(EBreak b) { 778 void setBreakBefore(EBreak b) {
780 DCHECK_LE(b, BreakValueLastAllowedForBreakAfterAndBefore);
781 m_nonInheritedData.m_breakBefore = b; 779 m_nonInheritedData.m_breakBefore = b;
782 } 780 }
783 781
784 // break-inside (shorthand for page-break-inside and 782 // break-inside (shorthand for page-break-inside and
785 // -webkit-column-break-inside) 783 // -webkit-column-break-inside)
786 static EBreak initialBreakInside() { return BreakAuto; } 784 static EBreak initialBreakInside() { return BreakAuto; }
787 EBreak breakInside() const { 785 EBreak breakInside() const {
788 return static_cast<EBreak>(m_nonInheritedData.m_breakInside); 786 return static_cast<EBreak>(m_nonInheritedData.m_breakInside);
789 } 787 }
790 void setBreakInside(EBreak b) { 788 void setBreakInside(EBreak b) {
(...skipping 3125 matching lines...) Expand 10 before | Expand all | Expand 10 after
3916 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 3914 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
3917 } 3915 }
3918 3916
3919 inline bool ComputedStyle::hasPseudoElementStyle() const { 3917 inline bool ComputedStyle::hasPseudoElementStyle() const {
3920 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3918 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3921 } 3919 }
3922 3920
3923 } // namespace blink 3921 } // namespace blink
3924 3922
3925 #endif // ComputedStyle_h 3923 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698