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

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

Issue 2633633003: Changed EInsideLink to an enum class with an unsigned type. (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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 // If you add more style bits here, you will also need to update 294 // If you add more style bits here, you will also need to update
295 // ComputedStyle::copyNonInheritedFromCached() 68 bits 295 // ComputedStyle::copyNonInheritedFromCached() 68 bits
296 } m_nonInheritedData; 296 } m_nonInheritedData;
297 297
298 // !END SYNC! 298 // !END SYNC!
299 299
300 void setBitDefaults() { 300 void setBitDefaults() {
301 ComputedStyleBase::setBitDefaults(); 301 ComputedStyleBase::setBitDefaults();
302 m_inheritedData.m_hasSimpleUnderline = false; 302 m_inheritedData.m_hasSimpleUnderline = false;
303 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor()); 303 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
304 m_inheritedData.m_insideLink = NotInsideLink; 304 m_inheritedData.m_insideLink =
305 static_cast<unsigned>(EInsideLink::kNotInsideLink);
305 306
306 m_nonInheritedData.m_effectiveDisplay = 307 m_nonInheritedData.m_effectiveDisplay =
307 m_nonInheritedData.m_originalDisplay = 308 m_nonInheritedData.m_originalDisplay =
308 static_cast<unsigned>(initialDisplay()); 309 static_cast<unsigned>(initialDisplay());
309 m_nonInheritedData.m_overflowAnchor = 310 m_nonInheritedData.m_overflowAnchor =
310 static_cast<unsigned>(initialOverflowAnchor()); 311 static_cast<unsigned>(initialOverflowAnchor());
311 m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX()); 312 m_nonInheritedData.m_overflowX = static_cast<unsigned>(initialOverflowX());
312 m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY()); 313 m_nonInheritedData.m_overflowY = static_cast<unsigned>(initialOverflowY());
313 m_nonInheritedData.m_verticalAlign = 314 m_nonInheritedData.m_verticalAlign =
314 static_cast<unsigned>(initialVerticalAlign()); 315 static_cast<unsigned>(initialVerticalAlign());
(...skipping 2270 matching lines...) Expand 10 before | Expand all | Expand 10 after
2585 SET_VAR(m_rareNonInheritedData, m_hasCompositorProxy, b); 2586 SET_VAR(m_rareNonInheritedData, m_hasCompositorProxy, b);
2586 } 2587 }
2587 2588
2588 bool isLink() const { return m_nonInheritedData.m_isLink; } 2589 bool isLink() const { return m_nonInheritedData.m_isLink; }
2589 void setIsLink(bool b) { m_nonInheritedData.m_isLink = b; } 2590 void setIsLink(bool b) { m_nonInheritedData.m_isLink = b; }
2590 2591
2591 EInsideLink insideLink() const { 2592 EInsideLink insideLink() const {
2592 return static_cast<EInsideLink>(m_inheritedData.m_insideLink); 2593 return static_cast<EInsideLink>(m_inheritedData.m_insideLink);
2593 } 2594 }
2594 void setInsideLink(EInsideLink insideLink) { 2595 void setInsideLink(EInsideLink insideLink) {
2595 m_inheritedData.m_insideLink = insideLink; 2596 m_inheritedData.m_insideLink = static_cast<unsigned>(insideLink);
2596 } 2597 }
2597 2598
2598 bool hasExplicitlyInheritedProperties() const { 2599 bool hasExplicitlyInheritedProperties() const {
2599 return m_nonInheritedData.m_explicitInheritance; 2600 return m_nonInheritedData.m_explicitInheritance;
2600 } 2601 }
2601 void setHasExplicitlyInheritedProperties() { 2602 void setHasExplicitlyInheritedProperties() {
2602 m_nonInheritedData.m_explicitInheritance = true; 2603 m_nonInheritedData.m_explicitInheritance = true;
2603 } 2604 }
2604 2605
2605 bool requiresAcceleratedCompositingForExternalReasons(bool b) { 2606 bool requiresAcceleratedCompositingForExternalReasons(bool b) {
(...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after
3932 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 3933 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
3933 } 3934 }
3934 3935
3935 inline bool ComputedStyle::hasPseudoElementStyle() const { 3936 inline bool ComputedStyle::hasPseudoElementStyle() const {
3936 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 3937 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
3937 } 3938 }
3938 3939
3939 } // namespace blink 3940 } // namespace blink
3940 3941
3941 #endif // ComputedStyle_h 3942 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698