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

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

Issue 2181953004: Changed ComputedStyle's EVisibility to be an enum class and fixed naming (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_move_computedstyle_around
Patch Set: Rebase Created 4 years, 4 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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 } m_nonInheritedData; 291 } m_nonInheritedData;
292 292
293 // !END SYNC! 293 // !END SYNC!
294 294
295 void setBitDefaults() 295 void setBitDefaults()
296 { 296 {
297 m_inheritedData.m_emptyCells = initialEmptyCells(); 297 m_inheritedData.m_emptyCells = initialEmptyCells();
298 m_inheritedData.m_captionSide = initialCaptionSide(); 298 m_inheritedData.m_captionSide = initialCaptionSide();
299 m_inheritedData.m_listStyleType = initialListStyleType(); 299 m_inheritedData.m_listStyleType = initialListStyleType();
300 m_inheritedData.m_listStylePosition = initialListStylePosition(); 300 m_inheritedData.m_listStylePosition = initialListStylePosition();
301 m_inheritedData.m_visibility = initialVisibility(); 301 m_inheritedData.m_visibility = static_cast<unsigned>(initialVisibility() );
302 m_inheritedData.m_textAlign = initialTextAlign(); 302 m_inheritedData.m_textAlign = initialTextAlign();
303 m_inheritedData.m_textTransform = initialTextTransform(); 303 m_inheritedData.m_textTransform = initialTextTransform();
304 m_inheritedData.m_textUnderline = false; 304 m_inheritedData.m_textUnderline = false;
305 m_inheritedData.m_cursorStyle = initialCursor(); 305 m_inheritedData.m_cursorStyle = initialCursor();
306 m_inheritedData.m_direction = initialDirection(); 306 m_inheritedData.m_direction = initialDirection();
307 m_inheritedData.m_whiteSpace = initialWhiteSpace(); 307 m_inheritedData.m_whiteSpace = initialWhiteSpace();
308 m_inheritedData.m_borderCollapse = initialBorderCollapse(); 308 m_inheritedData.m_borderCollapse = initialBorderCollapse();
309 m_inheritedData.m_rtlOrdering = initialRTLOrdering(); 309 m_inheritedData.m_rtlOrdering = initialRTLOrdering();
310 m_inheritedData.m_boxDirection = initialBoxDirection(); 310 m_inheritedData.m_boxDirection = initialBoxDirection();
311 m_inheritedData.m_printColorAdjust = initialPrintColorAdjust(); 311 m_inheritedData.m_printColorAdjust = initialPrintColorAdjust();
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1461 static TextSizeAdjust initialTextSizeAdjust() { return TextSizeAdjust::adjus tAuto(); } 1461 static TextSizeAdjust initialTextSizeAdjust() { return TextSizeAdjust::adjus tAuto(); }
1462 TextSizeAdjust getTextSizeAdjust() const { return m_rareInheritedData->m_tex tSizeAdjust; } 1462 TextSizeAdjust getTextSizeAdjust() const { return m_rareInheritedData->m_tex tSizeAdjust; }
1463 void setTextSizeAdjust(TextSizeAdjust sizeAdjust) { SET_VAR(m_rareInheritedD ata, m_textSizeAdjust, sizeAdjust); } 1463 void setTextSizeAdjust(TextSizeAdjust sizeAdjust) { SET_VAR(m_rareInheritedD ata, m_textSizeAdjust, sizeAdjust); }
1464 1464
1465 // text-transform (aka -epub-text-transform) 1465 // text-transform (aka -epub-text-transform)
1466 static ETextTransform initialTextTransform() { return TTNONE; } 1466 static ETextTransform initialTextTransform() { return TTNONE; }
1467 ETextTransform textTransform() const { return static_cast<ETextTransform>(m_ inheritedData.m_textTransform); } 1467 ETextTransform textTransform() const { return static_cast<ETextTransform>(m_ inheritedData.m_textTransform); }
1468 void setTextTransform(ETextTransform v) { m_inheritedData.m_textTransform = v; } 1468 void setTextTransform(ETextTransform v) { m_inheritedData.m_textTransform = v; }
1469 1469
1470 // visibility 1470 // visibility
1471 static EVisibility initialVisibility() { return VISIBLE; } 1471 static EVisibility initialVisibility() { return EVisibility::Visible; }
1472 EVisibility visibility() const { return static_cast<EVisibility>(m_inherited Data.m_visibility); } 1472 EVisibility visibility() const { return static_cast<EVisibility>(m_inherited Data.m_visibility); }
1473 void setVisibility(EVisibility v) { m_inheritedData.m_visibility = v; } 1473 void setVisibility(EVisibility v) { m_inheritedData.m_visibility = static_ca st<unsigned>(v); }
1474 1474
1475 // white-space inherited 1475 // white-space inherited
1476 static EWhiteSpace initialWhiteSpace() { return NORMAL; } 1476 static EWhiteSpace initialWhiteSpace() { return NORMAL; }
1477 EWhiteSpace whiteSpace() const { return static_cast<EWhiteSpace>(m_inherited Data.m_whiteSpace); } 1477 EWhiteSpace whiteSpace() const { return static_cast<EWhiteSpace>(m_inherited Data.m_whiteSpace); }
1478 void setWhiteSpace(EWhiteSpace v) { m_inheritedData.m_whiteSpace = v; } 1478 void setWhiteSpace(EWhiteSpace v) { m_inheritedData.m_whiteSpace = v; }
1479 1479
1480 // word-break inherited (aka -epub-word-break) 1480 // word-break inherited (aka -epub-word-break)
1481 static EWordBreak initialWordBreak() { return NormalWordBreak; } 1481 static EWordBreak initialWordBreak() { return NormalWordBreak; }
1482 EWordBreak wordBreak() const { return static_cast<EWordBreak>(m_rareInherite dData->wordBreak); } 1482 EWordBreak wordBreak() const { return static_cast<EWordBreak>(m_rareInherite dData->wordBreak); }
1483 void setWordBreak(EWordBreak b) { SET_VAR(m_rareInheritedData, wordBreak, b) ; } 1483 void setWordBreak(EWordBreak b) { SET_VAR(m_rareInheritedData, wordBreak, b) ; }
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after
2554 } 2554 }
2555 2555
2556 inline bool ComputedStyle::hasPseudoElementStyle() const 2556 inline bool ComputedStyle::hasPseudoElementStyle() const
2557 { 2557 {
2558 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 2558 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
2559 } 2559 }
2560 2560
2561 } // namespace blink 2561 } // namespace blink
2562 2562
2563 #endif // ComputedStyle_h 2563 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698