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

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

Issue 2828253004: DO NOT LAND. Revert of https://codereview.chromium.org/2797963002 (Closed)
Patch Set: simplify Created 3 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 | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
index 181eb2a135b0593bfd69f06ab3e064c23cc2a75c..a8b1cb5fee2a1dd7f69f9a4e9c750ce6e461d7c6 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -78,6 +78,10 @@ struct SameSizeAsComputedStyle : public RefCounted<SameSizeAsComputedStyle> {
void* data_refs[7];
void* own_ptrs[1];
void* data_ref_svg_style;
+
+ struct NonInheritedData {
+ unsigned m_bitfields[1];
+ } m_nonInheritedData;
};
// If this assert fails, it means that size of ComputedStyle has changed. Please
@@ -144,7 +148,8 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
rare_non_inherited_data_(o.rare_non_inherited_data_),
rare_inherited_data_(o.rare_inherited_data_),
style_inherited_data_(o.style_inherited_data_),
- svg_style_(o.svg_style_) {}
+ svg_style_(o.svg_style_),
+ m_nonInheritedData(o.m_nonInheritedData) {}
static StyleRecalcChange DiffPseudoStyles(const ComputedStyle& old_style,
const ComputedStyle& new_style) {
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698