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

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

Issue 2563913002: Added functionality in ComputedStyleBase to use platform/ types (Closed)
Patch Set: Rebase Created 3 years, 12 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 52c3c937240dcc2dffdc1f573a499e238783ac55..f2bca7d9197a84fbac1f6bfc59252393b9bd8370 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -200,7 +200,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
bool operator==(const InheritedData& other) const {
return (m_hasSimpleUnderline == other.m_hasSimpleUnderline) &&
(m_cursorStyle == other.m_cursorStyle) &&
- (m_direction == other.m_direction) &&
(m_rtlOrdering == other.m_rtlOrdering) &&
(m_insideLink == other.m_insideLink) &&
(m_writingMode == other.m_writingMode);
@@ -213,7 +212,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
- unsigned m_direction : 1; // TextDirection
// 32 bits
// non CSS2 inherited
@@ -313,7 +311,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
ComputedStyleBase::setBitDefaults();
m_inheritedData.m_hasSimpleUnderline = false;
m_inheritedData.m_cursorStyle = static_cast<unsigned>(initialCursor());
- m_inheritedData.m_direction = static_cast<unsigned>(initialDirection());
m_inheritedData.m_rtlOrdering = static_cast<unsigned>(initialRTLOrdering());
m_inheritedData.m_insideLink = NotInsideLink;
m_inheritedData.m_writingMode = static_cast<unsigned>(initialWritingMode());
@@ -2021,15 +2018,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
m_inheritedData.m_cursorStyle = static_cast<unsigned>(c);
}
- // direction
- static TextDirection initialDirection() { return TextDirection::Ltr; }
- TextDirection direction() const {
- return static_cast<TextDirection>(m_inheritedData.m_direction);
- }
- void setDirection(TextDirection v) {
- m_inheritedData.m_direction = static_cast<unsigned>(v);
- }
-
// color
static Color initialColor() { return Color::black; }
void setColor(const Color&);
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.in ('k') | third_party/WebKit/Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698