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

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

Issue 2841453002: Generate StyleVisualData in ComputedStyleBase. (Closed)
Patch Set: Rebase 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
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 6ffa36a18ecac80713d9b4ba8f05ea7370791bce..ba42c196a3373968a7aacccdf56ec3560f38e2cc 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp
@@ -115,7 +115,6 @@ PassRefPtr<ComputedStyle> ComputedStyle::Clone(const ComputedStyle& other) {
ALWAYS_INLINE ComputedStyle::ComputedStyle()
: ComputedStyleBase(), RefCounted<ComputedStyle>() {
box_data_.Init();
- visual_data_.Init();
rare_non_inherited_data_.Init();
rare_non_inherited_data_.Access()->deprecated_flexible_box_.Init();
rare_non_inherited_data_.Access()->flexible_box_.Init();
@@ -136,7 +135,6 @@ ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
: ComputedStyleBase(o),
RefCounted<ComputedStyle>(),
box_data_(o.box_data_),
- visual_data_(o.visual_data_),
rare_non_inherited_data_(o.rare_non_inherited_data_),
rare_inherited_data_(o.rare_inherited_data_),
style_inherited_data_(o.style_inherited_data_),
@@ -330,7 +328,6 @@ void ComputedStyle::InheritFrom(const ComputedStyle& inherit_parent,
void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
ComputedStyleBase::CopyNonInheritedFromCached(other);
box_data_ = other.box_data_;
- visual_data_ = other.visual_data_;
rare_non_inherited_data_ = other.rare_non_inherited_data_;
// The flags are copied one-by-one because they contain
@@ -477,7 +474,6 @@ bool ComputedStyle::NonInheritedEqual(const ComputedStyle& other) const {
VerticalAlign() == other.VerticalAlign() && // Not generated in
// ComputedStyleBase
box_data_ == other.box_data_ &&
- visual_data_ == other.visual_data_ &&
rare_non_inherited_data_ == other.rare_non_inherited_data_ &&
svg_style_->NonInheritedEqual(*other.svg_style_);
}
@@ -1053,7 +1049,8 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
style_inherited_data_->visited_link_color !=
other.style_inherited_data_->visited_link_color ||
HasSimpleUnderlineInternal() != other.HasSimpleUnderlineInternal() ||
- visual_data_->text_decoration != other.visual_data_->text_decoration) {
+ visual_data_->text_decoration_ !=
+ other.visual_data_->text_decoration_) {
diff.SetTextDecorationOrColorChanged();
} else if (rare_non_inherited_data_.Get() !=
other.rare_non_inherited_data_.Get() &&
@@ -1095,11 +1092,11 @@ void ComputedStyle::UpdatePropertySpecificDifferences(
}
}
- bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip;
+ bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip_;
bool other_has_clip =
- other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip;
+ other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip_;
if (has_clip != other_has_clip ||
- (has_clip && visual_data_->clip != other.visual_data_->clip))
+ (has_clip && visual_data_->clip_ != other.visual_data_->clip_))
diff.SetCSSClipChanged();
}
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/StyleVisualData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698