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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.cpp

Issue 2841433002: Generate StyleBackgroundData 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
4 * reserved. 4 * reserved.
5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 5 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 } 109 }
110 110
111 PassRefPtr<ComputedStyle> ComputedStyle::Clone(const ComputedStyle& other) { 111 PassRefPtr<ComputedStyle> ComputedStyle::Clone(const ComputedStyle& other) {
112 return AdoptRef(new ComputedStyle(other)); 112 return AdoptRef(new ComputedStyle(other));
113 } 113 }
114 114
115 ALWAYS_INLINE ComputedStyle::ComputedStyle() 115 ALWAYS_INLINE ComputedStyle::ComputedStyle()
116 : ComputedStyleBase(), RefCounted<ComputedStyle>() { 116 : ComputedStyleBase(), RefCounted<ComputedStyle>() {
117 box_data_.Init(); 117 box_data_.Init();
118 visual_data_.Init(); 118 visual_data_.Init();
119 background_data_.Init();
120 rare_non_inherited_data_.Init(); 119 rare_non_inherited_data_.Init();
121 rare_non_inherited_data_.Access()->deprecated_flexible_box_.Init(); 120 rare_non_inherited_data_.Access()->deprecated_flexible_box_.Init();
122 rare_non_inherited_data_.Access()->flexible_box_.Init(); 121 rare_non_inherited_data_.Access()->flexible_box_.Init();
123 rare_non_inherited_data_.Access()->multi_col_.Init(); 122 rare_non_inherited_data_.Access()->multi_col_.Init();
124 rare_non_inherited_data_.Access()->transform_.Init(); 123 rare_non_inherited_data_.Access()->transform_.Init();
125 rare_non_inherited_data_.Access()->will_change_.Init(); 124 rare_non_inherited_data_.Access()->will_change_.Init();
126 rare_non_inherited_data_.Access()->filter_.Init(); 125 rare_non_inherited_data_.Access()->filter_.Init();
127 rare_non_inherited_data_.Access()->backdrop_filter_.Init(); 126 rare_non_inherited_data_.Access()->backdrop_filter_.Init();
128 rare_non_inherited_data_.Access()->grid_.Init(); 127 rare_non_inherited_data_.Access()->grid_.Init();
129 rare_non_inherited_data_.Access()->grid_item_.Init(); 128 rare_non_inherited_data_.Access()->grid_item_.Init();
130 rare_non_inherited_data_.Access()->scroll_snap_.Init(); 129 rare_non_inherited_data_.Access()->scroll_snap_.Init();
131 rare_inherited_data_.Init(); 130 rare_inherited_data_.Init();
132 style_inherited_data_.Init(); 131 style_inherited_data_.Init();
133 svg_style_.Init(); 132 svg_style_.Init();
134 } 133 }
135 134
136 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o) 135 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
137 : ComputedStyleBase(o), 136 : ComputedStyleBase(o),
138 RefCounted<ComputedStyle>(), 137 RefCounted<ComputedStyle>(),
139 box_data_(o.box_data_), 138 box_data_(o.box_data_),
140 visual_data_(o.visual_data_), 139 visual_data_(o.visual_data_),
141 background_data_(o.background_data_),
142 rare_non_inherited_data_(o.rare_non_inherited_data_), 140 rare_non_inherited_data_(o.rare_non_inherited_data_),
143 rare_inherited_data_(o.rare_inherited_data_), 141 rare_inherited_data_(o.rare_inherited_data_),
144 style_inherited_data_(o.style_inherited_data_), 142 style_inherited_data_(o.style_inherited_data_),
145 svg_style_(o.svg_style_) {} 143 svg_style_(o.svg_style_) {}
146 144
147 static StyleRecalcChange DiffPseudoStyles(const ComputedStyle& old_style, 145 static StyleRecalcChange DiffPseudoStyles(const ComputedStyle& old_style,
148 const ComputedStyle& new_style) { 146 const ComputedStyle& new_style) {
149 // If the pseudoStyles have changed, ensure layoutObject triggers setStyle. 147 // If the pseudoStyles have changed, ensure layoutObject triggers setStyle.
150 if (!old_style.HasAnyPublicPseudoStyles() && 148 if (!old_style.HasAnyPublicPseudoStyles() &&
151 !new_style.HasAnyPublicPseudoStyles()) 149 !new_style.HasAnyPublicPseudoStyles())
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 } 324 }
327 style_inherited_data_ = inherit_parent.style_inherited_data_; 325 style_inherited_data_ = inherit_parent.style_inherited_data_;
328 if (svg_style_ != inherit_parent.svg_style_) 326 if (svg_style_ != inherit_parent.svg_style_)
329 svg_style_.Access()->InheritFrom(inherit_parent.svg_style_.Get()); 327 svg_style_.Access()->InheritFrom(inherit_parent.svg_style_.Get());
330 } 328 }
331 329
332 void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) { 330 void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
333 ComputedStyleBase::CopyNonInheritedFromCached(other); 331 ComputedStyleBase::CopyNonInheritedFromCached(other);
334 box_data_ = other.box_data_; 332 box_data_ = other.box_data_;
335 visual_data_ = other.visual_data_; 333 visual_data_ = other.visual_data_;
336 background_data_ = other.background_data_;
337 rare_non_inherited_data_ = other.rare_non_inherited_data_; 334 rare_non_inherited_data_ = other.rare_non_inherited_data_;
338 335
339 // The flags are copied one-by-one because they contain 336 // The flags are copied one-by-one because they contain
340 // bunch of stuff other than real style data. 337 // bunch of stuff other than real style data.
341 // See comments for each skipped flag below. 338 // See comments for each skipped flag below.
342 339
343 // These are not generated in ComputedStyleBase 340 // These are not generated in ComputedStyleBase
344 SetOriginalDisplay(other.OriginalDisplay()); 341 SetOriginalDisplay(other.OriginalDisplay());
345 SetVerticalAlign(other.VerticalAlign()); 342 SetVerticalAlign(other.VerticalAlign());
346 SetHasViewportUnits(other.HasViewportUnits()); 343 SetHasViewportUnits(other.HasViewportUnits());
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 471
475 bool ComputedStyle::NonInheritedEqual(const ComputedStyle& other) const { 472 bool ComputedStyle::NonInheritedEqual(const ComputedStyle& other) const {
476 // compare everything except the pseudoStyle pointer 473 // compare everything except the pseudoStyle pointer
477 return ComputedStyleBase::NonInheritedEqual(other) && 474 return ComputedStyleBase::NonInheritedEqual(other) &&
478 OriginalDisplay() == 475 OriginalDisplay() ==
479 other.OriginalDisplay() && // Not generated in ComputedStyleBase 476 other.OriginalDisplay() && // Not generated in ComputedStyleBase
480 VerticalAlign() == other.VerticalAlign() && // Not generated in 477 VerticalAlign() == other.VerticalAlign() && // Not generated in
481 // ComputedStyleBase 478 // ComputedStyleBase
482 box_data_ == other.box_data_ && 479 box_data_ == other.box_data_ &&
483 visual_data_ == other.visual_data_ && 480 visual_data_ == other.visual_data_ &&
484 background_data_ == other.background_data_ &&
485 rare_non_inherited_data_ == other.rare_non_inherited_data_ && 481 rare_non_inherited_data_ == other.rare_non_inherited_data_ &&
486 svg_style_->NonInheritedEqual(*other.svg_style_); 482 svg_style_->NonInheritedEqual(*other.svg_style_);
487 } 483 }
488 484
489 bool ComputedStyle::InheritedDataShared(const ComputedStyle& other) const { 485 bool ComputedStyle::InheritedDataShared(const ComputedStyle& other) const {
490 // This is a fast check that only looks if the data structures are shared. 486 // This is a fast check that only looks if the data structures are shared.
491 // TODO(sashab): Should ComputedStyleBase have an inheritedDataShared method? 487 // TODO(sashab): Should ComputedStyleBase have an inheritedDataShared method?
492 return ComputedStyleBase::InheritedEqual(other) && 488 return ComputedStyleBase::InheritedEqual(other) &&
493 style_inherited_data_.Get() == other.style_inherited_data_.Get() && 489 style_inherited_data_.Get() == other.style_inherited_data_.Get() &&
494 svg_style_.Get() == other.svg_style_.Get() && 490 svg_style_.Get() == other.svg_style_.Get() &&
(...skipping 2005 matching lines...) Expand 10 before | Expand all | Expand 10 after
2500 if (value < 0) 2496 if (value < 0)
2501 fvalue -= 0.5f; 2497 fvalue -= 0.5f;
2502 else 2498 else
2503 fvalue += 0.5f; 2499 fvalue += 0.5f;
2504 } 2500 }
2505 2501
2506 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); 2502 return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
2507 } 2503 }
2508 2504
2509 } // namespace blink 2505 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/StyleBackgroundData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698