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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index b72f5ac2cdecab92c4c883c4eefc9e887840fc82..963c39aa4db4db967db1ee568b251077604c6c01 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -372,7 +372,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
static_cast<unsigned>(initialBoxDirection());
m_inheritedData.m_printColorAdjust =
static_cast<unsigned>(initialPrintColorAdjust());
- m_inheritedData.m_pointerEvents = initialPointerEvents();
+ m_inheritedData.m_pointerEvents =
+ static_cast<unsigned>(initialPointerEvents());
m_inheritedData.m_insideLink = NotInsideLink;
m_inheritedData.m_writingMode = initialWritingMode();
@@ -2149,12 +2150,14 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
}
// pointer-events
- static EPointerEvents initialPointerEvents() { return PE_AUTO; }
+ static EPointerEvents initialPointerEvents() {
+ return EPointerEvents::PE_AUTO;
+ }
EPointerEvents pointerEvents() const {
return static_cast<EPointerEvents>(m_inheritedData.m_pointerEvents);
}
void setPointerEvents(EPointerEvents p) {
- m_inheritedData.m_pointerEvents = p;
+ m_inheritedData.m_pointerEvents = static_cast<unsigned>(p);
}
void setPointerEventsIsInherited(bool isInherited) {
m_nonInheritedData.m_isPointerEventsInherited = isInherited;
@@ -3572,7 +3575,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// Visibility utility functions.
bool visibleToHitTesting() const {
- return visibility() == EVisibility::Visible && pointerEvents() != PE_NONE;
+ return visibility() == EVisibility::Visible &&
+ pointerEvents() != EPointerEvents::PE_NONE;
}
// Animation utility functions.

Powered by Google App Engine
This is Rietveld 408576698