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

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

Issue 2620873002: Renamed EUnicodeBidi to just UnicodeBidi (Closed)
Patch Set: Rebase 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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 unsigned m_effectiveDisplay : 5; // EDisplay 253 unsigned m_effectiveDisplay : 5; // EDisplay
254 unsigned m_originalDisplay : 5; // EDisplay 254 unsigned m_originalDisplay : 5; // EDisplay
255 unsigned m_overflowAnchor : 2; // EOverflowAnchor 255 unsigned m_overflowAnchor : 2; // EOverflowAnchor
256 unsigned m_overflowX : 3; // EOverflow 256 unsigned m_overflowX : 3; // EOverflow
257 unsigned m_overflowY : 3; // EOverflow 257 unsigned m_overflowY : 3; // EOverflow
258 unsigned m_verticalAlign : 4; // EVerticalAlign 258 unsigned m_verticalAlign : 4; // EVerticalAlign
259 unsigned m_clear : 2; // EClear 259 unsigned m_clear : 2; // EClear
260 unsigned m_position : 3; // EPosition 260 unsigned m_position : 3; // EPosition
261 unsigned m_tableLayout : 1; // ETableLayout 261 unsigned m_tableLayout : 1; // ETableLayout
262 unsigned m_unicodeBidi : 3; // EUnicodeBidi 262 unsigned m_unicodeBidi : 3; // UnicodeBidi
263 263
264 // This is set if we used viewport units when resolving a length. 264 // This is set if we used viewport units when resolving a length.
265 // It is mutable so we can pass around const ComputedStyles to resolve 265 // It is mutable so we can pass around const ComputedStyles to resolve
266 // lengths. 266 // lengths.
267 mutable unsigned m_hasViewportUnits : 1; 267 mutable unsigned m_hasViewportUnits : 1;
268 268
269 // 32 bits 269 // 32 bits
270 270
271 unsigned m_breakBefore : 4; // EBreak 271 unsigned m_breakBefore : 4; // EBreak
272 unsigned m_breakAfter : 4; // EBreak 272 unsigned m_breakAfter : 4; // EBreak
(...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1849 // touch-action 1849 // touch-action
1850 static TouchAction initialTouchAction() { return TouchActionAuto; } 1850 static TouchAction initialTouchAction() { return TouchActionAuto; }
1851 TouchAction getTouchAction() const { 1851 TouchAction getTouchAction() const {
1852 return static_cast<TouchAction>(m_rareNonInheritedData->m_touchAction); 1852 return static_cast<TouchAction>(m_rareNonInheritedData->m_touchAction);
1853 } 1853 }
1854 void setTouchAction(TouchAction t) { 1854 void setTouchAction(TouchAction t) {
1855 SET_VAR(m_rareNonInheritedData, m_touchAction, t); 1855 SET_VAR(m_rareNonInheritedData, m_touchAction, t);
1856 } 1856 }
1857 1857
1858 // unicode-bidi 1858 // unicode-bidi
1859 static EUnicodeBidi initialUnicodeBidi() { return EUnicodeBidi::kNormal; } 1859 static UnicodeBidi initialUnicodeBidi() { return UnicodeBidi::kNormal; }
1860 EUnicodeBidi unicodeBidi() const { 1860 UnicodeBidi getUnicodeBidi() const {
1861 return static_cast<EUnicodeBidi>(m_nonInheritedData.m_unicodeBidi); 1861 return static_cast<UnicodeBidi>(m_nonInheritedData.m_unicodeBidi);
1862 } 1862 }
1863 void setUnicodeBidi(EUnicodeBidi b) { 1863 void setUnicodeBidi(UnicodeBidi b) {
1864 m_nonInheritedData.m_unicodeBidi = static_cast<unsigned>(b); 1864 m_nonInheritedData.m_unicodeBidi = static_cast<unsigned>(b);
1865 } 1865 }
1866 1866
1867 // vertical-align 1867 // vertical-align
1868 static EVerticalAlign initialVerticalAlign() { 1868 static EVerticalAlign initialVerticalAlign() {
1869 return EVerticalAlign::Baseline; 1869 return EVerticalAlign::Baseline;
1870 } 1870 }
1871 EVerticalAlign verticalAlign() const { 1871 EVerticalAlign verticalAlign() const {
1872 return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign); 1872 return static_cast<EVerticalAlign>(m_nonInheritedData.m_verticalAlign);
1873 } 1873 }
(...skipping 2066 matching lines...) Expand 10 before | Expand all | Expand 10 after
3940 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 3940 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
3941 } 3941 }
3942 3942
3943 inline bool ComputedStyle::hasPseudoElementStyle() const { 3943 inline bool ComputedStyle::hasPseudoElementStyle() const {
3944 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3944 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3945 } 3945 }
3946 3946
3947 } // namespace blink 3947 } // namespace blink
3948 3948
3949 #endif // ComputedStyle_h 3949 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698