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

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

Issue 2591373003: Changed WritingMode to an enum class and renamed its members (Closed)
Patch Set: Created 3 years, 12 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 313
314 void setBitDefaults() { 314 void setBitDefaults() {
315 ComputedStyleBase::setBitDefaults(); 315 ComputedStyleBase::setBitDefaults();
316 m_inheritedData.m_listStyleType = 316 m_inheritedData.m_listStyleType =
317 static_cast<unsigned>(initialListStyleType()); 317 static_cast<unsigned>(initialListStyleType());
318 m_inheritedData.m_hasSimpleUnderline = false; 318 m_inheritedData.m_hasSimpleUnderline = false;
319 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor()); 319 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
320 m_inheritedData.m_direction = initialDirection(); 320 m_inheritedData.m_direction = initialDirection();
321 m_inheritedData.m_rtlOrdering = static_cast<unsigned>(initialRTLOrdering()); 321 m_inheritedData.m_rtlOrdering = static_cast<unsigned>(initialRTLOrdering());
322 m_inheritedData.m_insideLink = NotInsideLink; 322 m_inheritedData.m_insideLink = NotInsideLink;
323 m_inheritedData.m_writingMode = initialWritingMode(); 323 m_inheritedData.m_writingMode = static_cast<unsigned>(initialWritingMode());
324 324
325 m_nonInheritedData.m_effectiveDisplay = 325 m_nonInheritedData.m_effectiveDisplay =
326 m_nonInheritedData.m_originalDisplay = 326 m_nonInheritedData.m_originalDisplay =
327 static_cast<unsigned>(initialDisplay()); 327 static_cast<unsigned>(initialDisplay());
328 m_nonInheritedData.m_overflowAnchor = 328 m_nonInheritedData.m_overflowAnchor =
329 static_cast<unsigned>(initialOverflowAnchor()); 329 static_cast<unsigned>(initialOverflowAnchor());
330 m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX()); 330 m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX());
331 m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY()); 331 m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
332 m_nonInheritedData.m_verticalAlign = initialVerticalAlign(); 332 m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
333 m_nonInheritedData.m_clear = initialClear(); 333 m_nonInheritedData.m_clear = initialClear();
(...skipping 1872 matching lines...) Expand 10 before | Expand all | Expand 10 after
2206 } 2206 }
2207 2207
2208 // -webkit-line-break 2208 // -webkit-line-break
2209 static LineBreak initialLineBreak() { return LineBreakAuto; } 2209 static LineBreak initialLineBreak() { return LineBreakAuto; }
2210 LineBreak getLineBreak() const { 2210 LineBreak getLineBreak() const {
2211 return static_cast<LineBreak>(m_rareInheritedData->lineBreak); 2211 return static_cast<LineBreak>(m_rareInheritedData->lineBreak);
2212 } 2212 }
2213 void setLineBreak(LineBreak b) { SET_VAR(m_rareInheritedData, lineBreak, b); } 2213 void setLineBreak(LineBreak b) { SET_VAR(m_rareInheritedData, lineBreak, b); }
2214 2214
2215 // writing-mode (aka -webkit-writing-mode, -epub-writing-mode) 2215 // writing-mode (aka -webkit-writing-mode, -epub-writing-mode)
2216 static WritingMode initialWritingMode() { return TopToBottomWritingMode; } 2216 static WritingMode initialWritingMode() { return WritingMode::HorizontalTb; }
2217 WritingMode getWritingMode() const { 2217 WritingMode getWritingMode() const {
2218 return static_cast<WritingMode>(m_inheritedData.m_writingMode); 2218 return static_cast<WritingMode>(m_inheritedData.m_writingMode);
2219 } 2219 }
2220 void setWritingMode(WritingMode v) { m_inheritedData.m_writingMode = v; } 2220 void setWritingMode(WritingMode v) {
2221 m_inheritedData.m_writingMode = static_cast<unsigned>(v);
2222 }
2221 2223
2222 // Text emphasis properties. 2224 // Text emphasis properties.
2223 static TextEmphasisFill initialTextEmphasisFill() { 2225 static TextEmphasisFill initialTextEmphasisFill() {
2224 return TextEmphasisFillFilled; 2226 return TextEmphasisFillFilled;
2225 } 2227 }
2226 static TextEmphasisMark initialTextEmphasisMark() { 2228 static TextEmphasisMark initialTextEmphasisMark() {
2227 return TextEmphasisMarkNone; 2229 return TextEmphasisMarkNone;
2228 } 2230 }
2229 static const AtomicString& initialTextEmphasisCustomMark() { 2231 static const AtomicString& initialTextEmphasisCustomMark() {
2230 return nullAtom; 2232 return nullAtom;
(...skipping 1754 matching lines...) Expand 10 before | Expand all | Expand 10 after
3985 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 3987 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
3986 } 3988 }
3987 3989
3988 inline bool ComputedStyle::hasPseudoElementStyle() const { 3990 inline bool ComputedStyle::hasPseudoElementStyle() const {
3989 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3991 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3990 } 3992 }
3991 3993
3992 } // namespace blink 3994 } // namespace blink
3993 3995
3994 #endif // ComputedStyle_h 3996 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698