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

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

Issue 2667543002: Moved nonproperty 'unique' to be generated in ComputedStyleBase. (Closed)
Patch Set: Rebase onto master Created 3 years, 11 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 88dd1e295373d6973753301a4e4af167bc12d840..10da3353e2999beca915ef1a33fcff683ca2defd 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -273,7 +273,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
// property
unsigned m_variableReference : 1; // A non-inherited property references a
// variable or @apply is used.
- unsigned m_unique : 1; // Style can not be shared.
unsigned m_emptyState : 1;
@@ -318,7 +317,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
m_nonInheritedData.m_pseudoBits = 0;
m_nonInheritedData.m_explicitInheritance = false;
m_nonInheritedData.m_variableReference = false;
- m_nonInheritedData.m_unique = false;
m_nonInheritedData.m_emptyState = false;
m_nonInheritedData.m_hasViewportUnits = false;
m_nonInheritedData.m_affectedByFocus = false;
@@ -2618,11 +2616,6 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
SET_VAR(m_rareNonInheritedData, m_isStackingContext, b);
}
- // A unique style is one that has matches something that makes it impossible
- // to share.
- bool unique() const { return m_nonInheritedData.m_unique; }
- void setUnique() { m_nonInheritedData.m_unique = true; }
sashab 2017/02/03 04:53:06 Maybe just do one prework patch to change setUniqu
shend 2017/02/03 05:11:33 See the other comment :)
-
float textAutosizingMultiplier() const {
return m_styleInheritedData->textAutosizingMultiplier;
}

Powered by Google App Engine
This is Rietveld 408576698