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

Unified Diff: third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp

Issue 1192983003: CSS Custom Properties (Variables) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Use m_unit Created 5 years, 1 month 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/StyleRareInheritedData.cpp
diff --git a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
index 612e93a857915c57901e99b9220cc78a16eee390..1c1622c066c4cd9e0107be983911edc00b43ad76 100644
--- a/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
+++ b/third_party/WebKit/Source/core/style/StyleRareInheritedData.cpp
@@ -54,6 +54,7 @@ struct SameSizeAsStyleRareInheritedData : public RefCounted<SameSizeAsStyleRareI
Color touchColors;
TabSize tabSize;
+ void* variables[1];
};
static_assert(sizeof(StyleRareInheritedData) <= sizeof(SameSizeAsStyleRareInheritedData), "StyleRareInheritedData should stay small");
@@ -159,6 +160,7 @@ StyleRareInheritedData::StyleRareInheritedData(const StyleRareInheritedData& o)
, tapHighlightColor(o.tapHighlightColor)
, appliedTextDecorations(o.appliedTextDecorations)
, m_tabSize(o.m_tabSize)
+ , variables(o.variables)
{
}
@@ -222,7 +224,8 @@ bool StyleRareInheritedData::operator==(const StyleRareInheritedData& o) const
&& m_textUnderlinePosition == o.m_textUnderlinePosition
&& m_rubyPosition == o.m_rubyPosition
&& dataEquivalent(listStyleImage.get(), o.listStyleImage.get())
- && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations);
+ && dataEquivalent(appliedTextDecorations, o.appliedTextDecorations)
+ && variables == o.variables;
}
bool StyleRareInheritedData::shadowDataEquivalent(const StyleRareInheritedData& o) const

Powered by Google App Engine
This is Rietveld 408576698