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

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

Issue 2351993002: Added support for non-inherited flags in ComputedStyleBase (Closed)
Patch Set: Rebase Created 4 years, 3 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 d70c43f78d2d162af1cc868f6750a8fcc26fb140..a9329bb8cdb9be8f014360876d750d4be0ed935c 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -251,7 +251,6 @@ protected:
&& m_verticalAlign == other.m_verticalAlign
&& m_clear == other.m_clear
&& m_position == other.m_position
- && m_floating == other.m_floating
&& m_tableLayout == other.m_tableLayout
&& m_unicodeBidi == other.m_unicodeBidi
// hasViewportUnits
@@ -281,7 +280,6 @@ protected:
unsigned m_verticalAlign : 4; // EVerticalAlign
unsigned m_clear : 2; // EClear
unsigned m_position : 3; // EPosition
- unsigned m_floating : 2; // EFloat
unsigned m_tableLayout : 1; // ETableLayout
unsigned m_unicodeBidi : 3; // EUnicodeBidi
@@ -368,7 +366,6 @@ protected:
m_nonInheritedData.m_verticalAlign = initialVerticalAlign();
m_nonInheritedData.m_clear = initialClear();
m_nonInheritedData.m_position = initialPosition();
- m_nonInheritedData.m_floating = static_cast<unsigned>(initialFloating());
m_nonInheritedData.m_tableLayout = initialTableLayout();
m_nonInheritedData.m_unicodeBidi = initialUnicodeBidi();
m_nonInheritedData.m_breakBefore = initialBreakBefore();
@@ -829,11 +826,6 @@ public:
m_rareNonInheritedData.access()->m_boxReflect = reflect;
}
- // float
- static EFloat initialFloating() { return EFloat::None; }
- EFloat floating() const { return static_cast<EFloat>(m_nonInheritedData.m_floating); }
- void setFloating(EFloat v) { m_nonInheritedData.m_floating = static_cast<unsigned>(v); }
-
// Grid properties.
static Vector<GridTrackSize> initialGridAutoRepeatTracks() { return Vector<GridTrackSize>(); /* none */ }
static size_t initialGridAutoRepeatInsertionPoint() { return 0; }

Powered by Google App Engine
This is Rietveld 408576698