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

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

Issue 2625553005: Changed EUnicodeBidi to an enum class and renamed its members (Closed)
Patch Set: 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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 static_cast<unsigned>(initialDisplay()); 313 static_cast<unsigned>(initialDisplay());
314 m_nonInheritedData.m_overflowAnchor = 314 m_nonInheritedData.m_overflowAnchor =
315 static_cast<unsigned>(initialOverflowAnchor()); 315 static_cast<unsigned>(initialOverflowAnchor());
316 m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX()); 316 m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX());
317 m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY()); 317 m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
318 m_nonInheritedData.m_verticalAlign = 318 m_nonInheritedData.m_verticalAlign =
319 static_cast<unsigned>(initialVerticalAlign()); 319 static_cast<unsigned>(initialVerticalAlign());
320 m_nonInheritedData.m_clear = initialClear(); 320 m_nonInheritedData.m_clear = initialClear();
321 m_nonInheritedData.m_position = initialPosition(); 321 m_nonInheritedData.m_position = initialPosition();
322 m_nonInheritedData.m_tableLayout = initialTableLayout(); 322 m_nonInheritedData.m_tableLayout = initialTableLayout();
323 m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi(); 323 m_nonInheritedData.m_unicodeBidi =
324 static_cast<unsigned>(initialUnicodeBidi());
324 m_nonInheritedData.m_breakBefore = initialBreakBefore(); 325 m_nonInheritedData.m_breakBefore = initialBreakBefore();
325 m_nonInheritedData.m_breakAfter = initialBreakAfter(); 326 m_nonInheritedData.m_breakAfter = initialBreakAfter();
326 m_nonInheritedData.m_breakInside = initialBreakInside(); 327 m_nonInheritedData.m_breakInside = initialBreakInside();
327 m_nonInheritedData.m_styleType = PseudoIdNone; 328 m_nonInheritedData.m_styleType = PseudoIdNone;
328 m_nonInheritedData.m_pseudoBits = 0; 329 m_nonInheritedData.m_pseudoBits = 0;
329 m_nonInheritedData.m_explicitInheritance = false; 330 m_nonInheritedData.m_explicitInheritance = false;
330 m_nonInheritedData.m_variableReference = false; 331 m_nonInheritedData.m_variableReference = false;
331 m_nonInheritedData.m_unique = false; 332 m_nonInheritedData.m_unique = false;
332 m_nonInheritedData.m_emptyState = false; 333 m_nonInheritedData.m_emptyState = false;
333 m_nonInheritedData.m_hasViewportUnits = false; 334 m_nonInheritedData.m_hasViewportUnits = false;
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1851 // touch-action 1852 // touch-action
1852 static TouchAction initialTouchAction() { return TouchActionAuto; } 1853 static TouchAction initialTouchAction() { return TouchActionAuto; }
1853 TouchAction getTouchAction() const { 1854 TouchAction getTouchAction() const {
1854 return static_cast<TouchAction>(m_rareNonInheritedData->m_touchAction); 1855 return static_cast<TouchAction>(m_rareNonInheritedData->m_touchAction);
1855 } 1856 }
1856 void setTouchAction(TouchAction t) { 1857 void setTouchAction(TouchAction t) {
1857 SET_VAR(m_rareNonInheritedData, m_touchAction, t); 1858 SET_VAR(m_rareNonInheritedData, m_touchAction, t);
1858 } 1859 }
1859 1860
1860 // unicode-bidi 1861 // unicode-bidi
1861 static EUnicodeBidi initialUnicodeBidi() { return UBNormal; } 1862 static EUnicodeBidi initialUnicodeBidi() { return EUnicodeBidi::kNormal; }
1862 EUnicodeBidi unicodeBidi() const { 1863 EUnicodeBidi unicodeBidi() const {
1863 return static_cast<EUnicodeBidi>(m_nonInheritedData.m_unicodeBidi); 1864 return static_cast<EUnicodeBidi>(m_nonInheritedData.m_unicodeBidi);
1864 } 1865 }
1865 void setUnicodeBidi(EUnicodeBidi b) { m_nonInheritedData.m_unicodeBidi = b; } 1866 void setUnicodeBidi(EUnicodeBidi b) {
1867 m_nonInheritedData.m_unicodeBidi = static_cast<unsigned>(b);
1868 }
1866 1869
1867 // vertical-align 1870 // vertical-align
1868 static EVerticalAlign initialVerticalAlign() { 1871 static EVerticalAlign initialVerticalAlign() {
1869 return EVerticalAlign::Baseline; 1872 return EVerticalAlign::Baseline;
1870 } 1873 }
1871 EVerticalAlign verticalAlign() const { 1874 EVerticalAlign verticalAlign() const {
1872 return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign); 1875 return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign);
1873 } 1876 }
1874 const Length& getVerticalAlignLength() const { 1877 const Length& getVerticalAlignLength() const {
1875 return m_box->verticalAlign(); 1878 return m_box->verticalAlign();
(...skipping 2073 matching lines...) Expand 10 before | Expand all | Expand 10 after
3949 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 3952 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
3950 } 3953 }
3951 3954
3952 inline bool ComputedStyle::hasPseudoElementStyle() const { 3955 inline bool ComputedStyle::hasPseudoElementStyle() const {
3953 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3956 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3954 } 3957 }
3955 3958
3956 } // namespace blink 3959 } // namespace blink
3957 3960
3958 #endif // ComputedStyle_h 3961 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698