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

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

Issue 2354843002: Changed EFloat to an enum class (Closed)
Patch Set: Rebase Created 4 years, 2 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 r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 m_inheritedData.m_insideLink = NotInsideLink; 361 m_inheritedData.m_insideLink = NotInsideLink;
362 m_inheritedData.m_writingMode = initialWritingMode(); 362 m_inheritedData.m_writingMode = initialWritingMode();
363 363
364 m_nonInheritedData.m_effectiveDisplay = m_nonInheritedData.m_originalDis play = initialDisplay(); 364 m_nonInheritedData.m_effectiveDisplay = m_nonInheritedData.m_originalDis play = initialDisplay();
365 m_nonInheritedData.m_overflowAnchor = initialOverflowAnchor(); 365 m_nonInheritedData.m_overflowAnchor = initialOverflowAnchor();
366 m_nonInheritedData.m_overflowX = initialOverflowX(); 366 m_nonInheritedData.m_overflowX = initialOverflowX();
367 m_nonInheritedData.m_overflowY = initialOverflowY(); 367 m_nonInheritedData.m_overflowY = initialOverflowY();
368 m_nonInheritedData.m_verticalAlign = initialVerticalAlign(); 368 m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
369 m_nonInheritedData.m_clear = initialClear(); 369 m_nonInheritedData.m_clear = initialClear();
370 m_nonInheritedData.m_position = initialPosition(); 370 m_nonInheritedData.m_position = initialPosition();
371 m_nonInheritedData.m_floating = initialFloating(); 371 m_nonInheritedData.m_floating = static_cast<unsigned>(initialFloating()) ;
372 m_nonInheritedData.m_tableLayout = initialTableLayout(); 372 m_nonInheritedData.m_tableLayout = initialTableLayout();
373 m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi(); 373 m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi();
374 m_nonInheritedData.m_breakBefore = initialBreakBefore(); 374 m_nonInheritedData.m_breakBefore = initialBreakBefore();
375 m_nonInheritedData.m_breakAfter = initialBreakAfter(); 375 m_nonInheritedData.m_breakAfter = initialBreakAfter();
376 m_nonInheritedData.m_breakInside = initialBreakInside(); 376 m_nonInheritedData.m_breakInside = initialBreakInside();
377 m_nonInheritedData.m_styleType = PseudoIdNone; 377 m_nonInheritedData.m_styleType = PseudoIdNone;
378 m_nonInheritedData.m_pseudoBits = 0; 378 m_nonInheritedData.m_pseudoBits = 0;
379 m_nonInheritedData.m_explicitInheritance = false; 379 m_nonInheritedData.m_explicitInheritance = false;
380 m_nonInheritedData.m_variableReference = false; 380 m_nonInheritedData.m_variableReference = false;
381 m_nonInheritedData.m_unique = false; 381 m_nonInheritedData.m_unique = false;
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 // -webkit-box-reflect 823 // -webkit-box-reflect
824 static StyleReflection* initialBoxReflect() { return 0; } 824 static StyleReflection* initialBoxReflect() { return 0; }
825 StyleReflection* boxReflect() const { return m_rareNonInheritedData->m_boxRe flect.get(); } 825 StyleReflection* boxReflect() const { return m_rareNonInheritedData->m_boxRe flect.get(); }
826 void setBoxReflect(PassRefPtr<StyleReflection> reflect) 826 void setBoxReflect(PassRefPtr<StyleReflection> reflect)
827 { 827 {
828 if (m_rareNonInheritedData->m_boxReflect != reflect) 828 if (m_rareNonInheritedData->m_boxReflect != reflect)
829 m_rareNonInheritedData.access()->m_boxReflect = reflect; 829 m_rareNonInheritedData.access()->m_boxReflect = reflect;
830 } 830 }
831 831
832 // float 832 // float
833 static EFloat initialFloating() { return NoFloat; } 833 static EFloat initialFloating() { return EFloat::NoFloat; }
834 EFloat floating() const { return static_cast<EFloat>(m_nonInheritedData.m_fl oating); } 834 EFloat floating() const { return static_cast<EFloat>(m_nonInheritedData.m_fl oating); }
835 void setFloating(EFloat v) { m_nonInheritedData.m_floating = v; } 835 void setFloating(EFloat v) { m_nonInheritedData.m_floating = static_cast<uns igned>(v); }
836 836
837 // Grid properties. 837 // Grid properties.
838 static Vector<GridTrackSize> initialGridAutoRepeatTracks() { return Vector<G ridTrackSize>(); /* none */ } 838 static Vector<GridTrackSize> initialGridAutoRepeatTracks() { return Vector<G ridTrackSize>(); /* none */ }
839 static size_t initialGridAutoRepeatInsertionPoint() { return 0; } 839 static size_t initialGridAutoRepeatInsertionPoint() { return 0; }
840 static AutoRepeatType initialGridAutoRepeatType() { return NoAutoRepeat; } 840 static AutoRepeatType initialGridAutoRepeatType() { return NoAutoRepeat; }
841 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); } 841 static NamedGridLinesMap initialNamedGridColumnLines() { return NamedGridLin esMap(); }
842 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); } 842 static NamedGridLinesMap initialNamedGridRowLines() { return NamedGridLinesM ap(); }
843 static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return O rderedNamedGridLines(); } 843 static OrderedNamedGridLines initialOrderedNamedGridColumnLines() { return O rderedNamedGridLines(); }
844 static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return Orde redNamedGridLines(); } 844 static OrderedNamedGridLines initialOrderedNamedGridRowLines() { return Orde redNamedGridLines(); }
845 static NamedGridAreaMap initialNamedGridArea() { return NamedGridAreaMap(); } 845 static NamedGridAreaMap initialNamedGridArea() { return NamedGridAreaMap(); }
(...skipping 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after
2126 setBorderRadius(LengthSize(Length(s.width(), Fixed), Length(s.height(), Fixed))); 2126 setBorderRadius(LengthSize(Length(s.width(), Fixed), Length(s.height(), Fixed)));
2127 } 2127 }
2128 2128
2129 FloatRoundedRect getRoundedBorderFor(const LayoutRect& borderRect, bool incl udeLogicalLeftEdge = true, 2129 FloatRoundedRect getRoundedBorderFor(const LayoutRect& borderRect, bool incl udeLogicalLeftEdge = true,
2130 bool includeLogicalRightEdge = true) const; 2130 bool includeLogicalRightEdge = true) const;
2131 FloatRoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const; 2131 FloatRoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;
2132 FloatRoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect, 2132 FloatRoundedRect getRoundedInnerBorderFor(const LayoutRect& borderRect,
2133 const LayoutRectOutsets insets, bool includeLogicalLeftEdge, bool includ eLogicalRightEdge) const; 2133 const LayoutRectOutsets insets, bool includeLogicalLeftEdge, bool includ eLogicalRightEdge) const;
2134 2134
2135 // Float utility functions. 2135 // Float utility functions.
2136 bool isFloating() const { return m_nonInheritedData.m_floating != NoFloat; } 2136 bool isFloating() const { return floating() != EFloat::NoFloat; }
2137 2137
2138 // Mix-blend-mode utility functions. 2138 // Mix-blend-mode utility functions.
2139 bool hasBlendMode() const { return blendMode() != WebBlendModeNormal; } 2139 bool hasBlendMode() const { return blendMode() != WebBlendModeNormal; }
2140 2140
2141 // Motion utility functions. 2141 // Motion utility functions.
2142 bool hasOffsetPath() const { return offsetPath(); } 2142 bool hasOffsetPath() const { return offsetPath(); }
2143 2143
2144 // Direction utility functions. 2144 // Direction utility functions.
2145 bool isLeftToRightDirection() const { return direction() == LTR; } 2145 bool isLeftToRightDirection() const { return direction() == LTR; }
2146 2146
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
2620 } 2620 }
2621 2621
2622 inline bool ComputedStyle::hasPseudoElementStyle() const 2622 inline bool ComputedStyle::hasPseudoElementStyle() const
2623 { 2623 {
2624 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 2624 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
2625 } 2625 }
2626 2626
2627 } // namespace blink 2627 } // namespace blink
2628 2628
2629 #endif // ComputedStyle_h 2629 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/TextAutosizer.cpp ('k') | third_party/WebKit/Source/core/style/ComputedStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698