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

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2742253002: Move cursor property to be generated in ComputedStyleBase. (Closed)
Patch Set: Rebase Created 3 years, 9 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 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 b8fcd80cd9aec15416b89efaf1db44e7e2a71665..f65eff3634047a68b26a93060453eab516b77654 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -207,13 +207,11 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
struct InheritedData {
InheritedData()
: m_hasSimpleUnderline(false),
- m_cursorStyle(static_cast<unsigned>(initialCursor())),
m_insideLink(static_cast<unsigned>(EInsideLink::kNotInsideLink)) {}
bool operator==(const InheritedData& other) const {
// Generated properties are compared in ComputedStyleBase
return (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
- (m_cursorStyle == other.m_cursorStyle) &&
(m_insideLink == other.m_insideLink);
}
@@ -223,7 +221,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
unsigned m_hasSimpleUnderline : 1; // True if 'underline solid' is the only
// text decoration on this element.
- unsigned m_cursorStyle : 6; // ECursor
// non CSS2 inherited
unsigned m_insideLink : 2; // EInsideLink
@@ -1869,15 +1866,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
short verticalBorderSpacing() const;
void setVerticalBorderSpacing(short);
- // cursor
- static ECursor initialCursor() { return ECursor::kAuto; }
- ECursor cursor() const {
- return static_cast<ECursor>(m_inheritedData.m_cursorStyle);
- }
- void setCursor(ECursor c) {
- m_inheritedData.m_cursorStyle = static_cast<unsigned>(c);
- }
-
// color
static Color initialColor() { return Color::black; }
void setColor(const Color&);
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValueIDMappings.h ('k') | third_party/WebKit/Source/core/style/ComputedStyleConstants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698