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

Unified Diff: Source/core/css/StylePropertySet.h

Issue 1036653002: Clamp shape-margin to zero (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add contentWidthExcludingScrollbar Created 5 years, 8 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
« no previous file with comments | « Source/core/css/PropertySetCSSStyleDeclaration.cpp ('k') | Source/core/css/StylePropertySet.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/StylePropertySet.h
diff --git a/Source/core/css/StylePropertySet.h b/Source/core/css/StylePropertySet.h
index 528bf865e715b8f637edf3cc13d6440d45425916..c11414658dcbdadfb1281b77ae286e9ed41cb08d 100644
--- a/Source/core/css/StylePropertySet.h
+++ b/Source/core/css/StylePropertySet.h
@@ -115,6 +115,9 @@ public:
bool isMutable() const { return m_isMutable; }
+ bool forceOverride() const { return m_forceOverride; }
leviw_travelin_and_unemployed 2015/04/21 22:58:41 Do you mean to include this stuff? Is it necessary
+ void setForceOverride(bool b) { m_forceOverride = b; }
+
bool hasFailedOrCanceledSubresources() const;
static unsigned averageSizeInBytes();
@@ -130,23 +133,26 @@ public:
protected:
- enum { MaxArraySize = (1 << 28) - 1 };
+ enum { MaxArraySize = (1 << 27) - 1 };
StylePropertySet(CSSParserMode cssParserMode)
: m_cssParserMode(cssParserMode)
, m_isMutable(true)
+ , m_forceOverride(false)
, m_arraySize(0)
{ }
StylePropertySet(CSSParserMode cssParserMode, unsigned immutableArraySize)
: m_cssParserMode(cssParserMode)
, m_isMutable(false)
+ , m_forceOverride(false)
, m_arraySize(std::min(immutableArraySize, unsigned(MaxArraySize)))
{ }
unsigned m_cssParserMode : 3;
mutable unsigned m_isMutable : 1;
- unsigned m_arraySize : 28;
+ mutable unsigned m_forceOverride : 1;
+ unsigned m_arraySize : 27;
friend class PropertySetCSSStyleDeclaration;
};
« no previous file with comments | « Source/core/css/PropertySetCSSStyleDeclaration.cpp ('k') | Source/core/css/StylePropertySet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698