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

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

Issue 2542843002: Changed EPointerEvents to an enum class and renamed its members to keywords (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 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor()); 365 m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
366 m_inheritedData.m_direction = initialDirection(); 366 m_inheritedData.m_direction = initialDirection();
367 m_inheritedData.m_whiteSpace = static_cast<unsigned>(initialWhiteSpace()); 367 m_inheritedData.m_whiteSpace = static_cast<unsigned>(initialWhiteSpace());
368 m_inheritedData.m_borderCollapse = 368 m_inheritedData.m_borderCollapse =
369 static_cast<unsigned>(initialBorderCollapse()); 369 static_cast<unsigned>(initialBorderCollapse());
370 m_inheritedData.m_rtlOrdering = initialRTLOrdering(); 370 m_inheritedData.m_rtlOrdering = initialRTLOrdering();
371 m_inheritedData.m_boxDirection = 371 m_inheritedData.m_boxDirection =
372 static_cast<unsigned>(initialBoxDirection()); 372 static_cast<unsigned>(initialBoxDirection());
373 m_inheritedData.m_printColorAdjust = 373 m_inheritedData.m_printColorAdjust =
374 static_cast<unsigned>(initialPrintColorAdjust()); 374 static_cast<unsigned>(initialPrintColorAdjust());
375 m_inheritedData.m_pointerEvents = initialPointerEvents(); 375 m_inheritedData.m_pointerEvents =
376 static_cast<unsigned>(initialPointerEvents());
376 m_inheritedData.m_insideLink = NotInsideLink; 377 m_inheritedData.m_insideLink = NotInsideLink;
377 m_inheritedData.m_writingMode = initialWritingMode(); 378 m_inheritedData.m_writingMode = initialWritingMode();
378 379
379 m_nonInheritedData.m_effectiveDisplay = 380 m_nonInheritedData.m_effectiveDisplay =
380 m_nonInheritedData.m_originalDisplay = 381 m_nonInheritedData.m_originalDisplay =
381 static_cast<unsigned>(initialDisplay()); 382 static_cast<unsigned>(initialDisplay());
382 m_nonInheritedData.m_overflowAnchor = initialOverflowAnchor(); 383 m_nonInheritedData.m_overflowAnchor = initialOverflowAnchor();
383 m_nonInheritedData.m_overflowX = initialOverflowX(); 384 m_nonInheritedData.m_overflowX = initialOverflowX();
384 m_nonInheritedData.m_overflowY = initialOverflowY(); 385 m_nonInheritedData.m_overflowY = initialOverflowY();
385 m_nonInheritedData.m_verticalAlign = initialVerticalAlign(); 386 m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
(...skipping 1756 matching lines...) Expand 10 before | Expand all | Expand 10 after
2142 // overflow-wrap (aka word-wrap) 2143 // overflow-wrap (aka word-wrap)
2143 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; } 2144 static EOverflowWrap initialOverflowWrap() { return NormalOverflowWrap; }
2144 EOverflowWrap overflowWrap() const { 2145 EOverflowWrap overflowWrap() const {
2145 return static_cast<EOverflowWrap>(m_rareInheritedData->overflowWrap); 2146 return static_cast<EOverflowWrap>(m_rareInheritedData->overflowWrap);
2146 } 2147 }
2147 void setOverflowWrap(EOverflowWrap b) { 2148 void setOverflowWrap(EOverflowWrap b) {
2148 SET_VAR(m_rareInheritedData, overflowWrap, b); 2149 SET_VAR(m_rareInheritedData, overflowWrap, b);
2149 } 2150 }
2150 2151
2151 // pointer-events 2152 // pointer-events
2152 static EPointerEvents initialPointerEvents() { return PE_AUTO; } 2153 static EPointerEvents initialPointerEvents() {
2154 return EPointerEvents::PE_AUTO;
2155 }
2153 EPointerEvents pointerEvents() const { 2156 EPointerEvents pointerEvents() const {
2154 return static_cast<EPointerEvents>(m_inheritedData.m_pointerEvents); 2157 return static_cast<EPointerEvents>(m_inheritedData.m_pointerEvents);
2155 } 2158 }
2156 void setPointerEvents(EPointerEvents p) { 2159 void setPointerEvents(EPointerEvents p) {
2157 m_inheritedData.m_pointerEvents = p; 2160 m_inheritedData.m_pointerEvents = static_cast<unsigned>(p);
2158 } 2161 }
2159 void setPointerEventsIsInherited(bool isInherited) { 2162 void setPointerEventsIsInherited(bool isInherited) {
2160 m_nonInheritedData.m_isPointerEventsInherited = isInherited; 2163 m_nonInheritedData.m_isPointerEventsInherited = isInherited;
2161 } 2164 }
2162 2165
2163 // quotes 2166 // quotes
2164 static QuotesData* initialQuotes() { return 0; } 2167 static QuotesData* initialQuotes() { return 0; }
2165 QuotesData* quotes() const { return m_rareInheritedData->quotes.get(); } 2168 QuotesData* quotes() const { return m_rareInheritedData->quotes.get(); }
2166 void setQuotes(PassRefPtr<QuotesData>); 2169 void setQuotes(PassRefPtr<QuotesData>);
2167 2170
(...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after
3565 bool isOverflowVisible() const { 3568 bool isOverflowVisible() const {
3566 DCHECK(overflowX() != OverflowVisible || overflowX() == overflowY()); 3569 DCHECK(overflowX() != OverflowVisible || overflowX() == overflowY());
3567 return overflowX() == OverflowVisible; 3570 return overflowX() == OverflowVisible;
3568 } 3571 }
3569 bool isOverflowPaged() const { 3572 bool isOverflowPaged() const {
3570 return overflowY() == OverflowPagedX || overflowY() == OverflowPagedY; 3573 return overflowY() == OverflowPagedX || overflowY() == OverflowPagedY;
3571 } 3574 }
3572 3575
3573 // Visibility utility functions. 3576 // Visibility utility functions.
3574 bool visibleToHitTesting() const { 3577 bool visibleToHitTesting() const {
3575 return visibility() == EVisibility::Visible && pointerEvents() != PE_NONE; 3578 return visibility() == EVisibility::Visible &&
3579 pointerEvents() != EPointerEvents::PE_NONE;
3576 } 3580 }
3577 3581
3578 // Animation utility functions. 3582 // Animation utility functions.
3579 bool shouldCompositeForCurrentAnimations() const { 3583 bool shouldCompositeForCurrentAnimations() const {
3580 return hasCurrentOpacityAnimation() || hasCurrentTransformAnimation() || 3584 return hasCurrentOpacityAnimation() || hasCurrentTransformAnimation() ||
3581 hasCurrentFilterAnimation() || hasCurrentBackdropFilterAnimation(); 3585 hasCurrentFilterAnimation() || hasCurrentBackdropFilterAnimation();
3582 } 3586 }
3583 bool isRunningAnimationOnCompositor() const { 3587 bool isRunningAnimationOnCompositor() const {
3584 return isRunningOpacityAnimationOnCompositor() || 3588 return isRunningOpacityAnimationOnCompositor() ||
3585 isRunningTransformAnimationOnCompositor() || 3589 isRunningTransformAnimationOnCompositor() ||
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
4101 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1); 4105 m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
4102 } 4106 }
4103 4107
4104 inline bool ComputedStyle::hasPseudoElementStyle() const { 4108 inline bool ComputedStyle::hasPseudoElementStyle() const {
4105 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask; 4109 return m_nonInheritedData.m_pseudoBits & ElementPseudoIdMask;
4106 } 4110 }
4107 4111
4108 } // namespace blink 4112 } // namespace blink
4109 4113
4110 #endif // ComputedStyle_h 4114 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698