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

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

Issue 2516263002: Changed ETextTransform to an enum class and renamed its members (Closed)
Patch Set: Created 4 years 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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 // !END SYNC! 362 // !END SYNC!
363 363
364 void setBitDefaults() { 364 void setBitDefaults() {
365 ComputedStyleBase::setBitDefaults(); 365 ComputedStyleBase::setBitDefaults();
366 m_inheritedData.m_captionSide = static_cast<unsigned>(initialCaptionSide()); 366 m_inheritedData.m_captionSide = static_cast<unsigned>(initialCaptionSide());
367 m_inheritedData.m_listStyleType = 367 m_inheritedData.m_listStyleType =
368 static_cast<unsigned>(initialListStyleType()); 368 static_cast<unsigned>(initialListStyleType());
369 m_inheritedData.m_listStylePosition = 369 m_inheritedData.m_listStylePosition =
370 static_cast<unsigned>(initialListStylePosition()); 370 static_cast<unsigned>(initialListStylePosition());
371 m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign()); 371 m_inheritedData.m_textAlign = static_cast<unsigned>(initialTextAlign());
372 m_inheritedData.m_textTransform = initialTextTransform(); 372 m_inheritedData.m_textTransform =
373 static_cast<unsigned>(initialTextTransform());
373 m_inheritedData.m_hasSimpleUnderline = false; 374 m_inheritedData.m_hasSimpleUnderline = false;
374 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor()); 375 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
375 m_inheritedData.m_direction = initialDirection(); 376 m_inheritedData.m_direction = initialDirection();
376 m_inheritedData.m_whiteSpace = initialWhiteSpace(); 377 m_inheritedData.m_whiteSpace = initialWhiteSpace();
377 m_inheritedData.m_borderCollapse = initialBorderCollapse(); 378 m_inheritedData.m_borderCollapse = initialBorderCollapse();
378 m_inheritedData.m_rtlOrdering = initialRTLOrdering(); 379 m_inheritedData.m_rtlOrdering = initialRTLOrdering();
379 m_inheritedData.m_boxDirection = initialBoxDirection(); 380 m_inheritedData.m_boxDirection = initialBoxDirection();
380 m_inheritedData.m_printColorAdjust = initialPrintColorAdjust(); 381 m_inheritedData.m_printColorAdjust = initialPrintColorAdjust();
381 m_inheritedData.m_pointerEvents = initialPointerEvents(); 382 m_inheritedData.m_pointerEvents = initialPointerEvents();
382 m_inheritedData.m_insideLink = NotInsideLink; 383 m_inheritedData.m_insideLink = NotInsideLink;
(...skipping 1913 matching lines...) Expand 10 before | Expand all | Expand 10 after
2296 return TextSizeAdjust::adjustAuto(); 2297 return TextSizeAdjust::adjustAuto();
2297 } 2298 }
2298 TextSizeAdjust getTextSizeAdjust() const { 2299 TextSizeAdjust getTextSizeAdjust() const {
2299 return m_rareInheritedData->m_textSizeAdjust; 2300 return m_rareInheritedData->m_textSizeAdjust;
2300 } 2301 }
2301 void setTextSizeAdjust(TextSizeAdjust sizeAdjust) { 2302 void setTextSizeAdjust(TextSizeAdjust sizeAdjust) {
2302 SET_VAR(m_rareInheritedData, m_textSizeAdjust, sizeAdjust); 2303 SET_VAR(m_rareInheritedData, m_textSizeAdjust, sizeAdjust);
2303 } 2304 }
2304 2305
2305 // text-transform (aka -epub-text-transform) 2306 // text-transform (aka -epub-text-transform)
2306 static ETextTransform initialTextTransform() { return TTNONE; } 2307 static ETextTransform initialTextTransform() { return ETextTransform::None; }
2307 ETextTransform textTransform() const { 2308 ETextTransform textTransform() const {
2308 return static_cast<ETextTransform>(m_inheritedData.m_textTransform); 2309 return static_cast<ETextTransform>(m_inheritedData.m_textTransform);
2309 } 2310 }
2310 void setTextTransform(ETextTransform v) { 2311 void setTextTransform(ETextTransform v) {
2311 m_inheritedData.m_textTransform = v; 2312 m_inheritedData.m_textTransform = static_cast<unsigned>(v);
2312 } 2313 }
2313 2314
2314 // white-space inherited 2315 // white-space inherited
2315 static EWhiteSpace initialWhiteSpace() { return NORMAL; } 2316 static EWhiteSpace initialWhiteSpace() { return NORMAL; }
2316 EWhiteSpace whiteSpace() const { 2317 EWhiteSpace whiteSpace() const {
2317 return static_cast<EWhiteSpace>(m_inheritedData.m_whiteSpace); 2318 return static_cast<EWhiteSpace>(m_inheritedData.m_whiteSpace);
2318 } 2319 }
2319 void setWhiteSpace(EWhiteSpace v) { m_inheritedData.m_whiteSpace = v; } 2320 void setWhiteSpace(EWhiteSpace v) { m_inheritedData.m_whiteSpace = v; }
2320 2321
2321 // word-break inherited (aka -epub-word-break) 2322 // word-break inherited (aka -epub-word-break)
(...skipping 1789 matching lines...) Expand 10 before | Expand all | Expand 10 after
4111 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 4112 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
4112 } 4113 }
4113 4114
4114 inline bool ComputedStyle::hasPseudoElementStyle() const { 4115 inline bool ComputedStyle::hasPseudoElementStyle() const {
4115 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 4116 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
4116 } 4117 }
4117 4118
4118 } // namespace blink 4119 } // namespace blink
4119 4120
4120 #endif // ComputedStyle_h 4121 #endif // ComputedStyle_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutText.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