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

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

Issue 2922323002: Remove extraneous "data_" on RareNonInheritedData member. (Closed)
Patch Set: Created 3 years, 6 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 return new_style; 121 return new_style;
122 } 122 }
123 123
124 RefPtr<ComputedStyle> ComputedStyle::Clone(const ComputedStyle& other) { 124 RefPtr<ComputedStyle> ComputedStyle::Clone(const ComputedStyle& other) {
125 return AdoptRef(new ComputedStyle(other)); 125 return AdoptRef(new ComputedStyle(other));
126 } 126 }
127 127
128 ALWAYS_INLINE ComputedStyle::ComputedStyle() 128 ALWAYS_INLINE ComputedStyle::ComputedStyle()
129 : ComputedStyleBase(), RefCounted<ComputedStyle>() { 129 : ComputedStyleBase(), RefCounted<ComputedStyle>() {
130 rare_non_inherited_data_.Init(); 130 rare_non_inherited_data_.Init();
131 rare_non_inherited_data_.Access()->deprecated_flexible_box_data_data_.Init(); 131 rare_non_inherited_data_.Access()->deprecated_flexible_box_data_.Init();
132 rare_non_inherited_data_.Access()->flexible_box_data_.Init(); 132 rare_non_inherited_data_.Access()->flexible_box_data_.Init();
133 rare_non_inherited_data_.Access()->multi_col_data_.Init(); 133 rare_non_inherited_data_.Access()->multi_col_data_.Init();
134 rare_non_inherited_data_.Access()->transform_data_.Init(); 134 rare_non_inherited_data_.Access()->transform_data_.Init();
135 rare_non_inherited_data_.Access()->will_change_data_.Init(); 135 rare_non_inherited_data_.Access()->will_change_data_.Init();
136 rare_non_inherited_data_.Access()->filter_.Init(); 136 rare_non_inherited_data_.Access()->filter_.Init();
137 rare_non_inherited_data_.Access()->backdrop_filter_.Init(); 137 rare_non_inherited_data_.Access()->backdrop_filter_.Init();
138 rare_non_inherited_data_.Access()->grid_data_.Init(); 138 rare_non_inherited_data_.Access()->grid_data_.Init();
139 rare_non_inherited_data_.Access()->grid_item_data_.Init(); 139 rare_non_inherited_data_.Access()->grid_item_data_.Init();
140 rare_non_inherited_data_.Access()->scroll_snap_data_.Init(); 140 rare_non_inherited_data_.Access()->scroll_snap_data_.Init();
141 svg_style_.Init(); 141 svg_style_.Init();
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 *rare_non_inherited_data_->grid_data_.Get() != 580 *rare_non_inherited_data_->grid_data_.Get() !=
581 *other.rare_non_inherited_data_->grid_data_.Get()) 581 *other.rare_non_inherited_data_->grid_data_.Get())
582 return true; 582 return true;
583 583
584 if (rare_non_inherited_data_->grid_item_data_.Get() != 584 if (rare_non_inherited_data_->grid_item_data_.Get() !=
585 other.rare_non_inherited_data_->grid_item_data_.Get() && 585 other.rare_non_inherited_data_->grid_item_data_.Get() &&
586 *rare_non_inherited_data_->grid_item_data_.Get() != 586 *rare_non_inherited_data_->grid_item_data_.Get() !=
587 *other.rare_non_inherited_data_->grid_item_data_.Get()) 587 *other.rare_non_inherited_data_->grid_item_data_.Get())
588 return true; 588 return true;
589 589
590 if (rare_non_inherited_data_->deprecated_flexible_box_data_data_.Get() != 590 if (rare_non_inherited_data_->deprecated_flexible_box_data_.Get() !=
591 other.rare_non_inherited_data_->deprecated_flexible_box_data_data_ 591 other.rare_non_inherited_data_->deprecated_flexible_box_data_
592 .Get() && 592 .Get() &&
593 *rare_non_inherited_data_->deprecated_flexible_box_data_data_.Get() != 593 *rare_non_inherited_data_->deprecated_flexible_box_data_.Get() !=
594 *other.rare_non_inherited_data_->deprecated_flexible_box_data_data_ 594 *other.rare_non_inherited_data_->deprecated_flexible_box_data_
595 .Get()) 595 .Get())
596 return true; 596 return true;
597 597
598 if (rare_non_inherited_data_->flexible_box_data_.Get() != 598 if (rare_non_inherited_data_->flexible_box_data_.Get() !=
599 other.rare_non_inherited_data_->flexible_box_data_.Get() && 599 other.rare_non_inherited_data_->flexible_box_data_.Get() &&
600 *rare_non_inherited_data_->flexible_box_data_.Get() != 600 *rare_non_inherited_data_->flexible_box_data_.Get() !=
601 *other.rare_non_inherited_data_->flexible_box_data_.Get()) 601 *other.rare_non_inherited_data_->flexible_box_data_.Get())
602 return true; 602 return true;
603 603
604 if (rare_non_inherited_data_->multi_col_data_.Get() != 604 if (rare_non_inherited_data_->multi_col_data_.Get() !=
(...skipping 1747 matching lines...) Expand 10 before | Expand all | Expand 10 after
2352 if (value < 0) 2352 if (value < 0)
2353 fvalue -= 0.5f; 2353 fvalue -= 0.5f;
2354 else 2354 else
2355 fvalue += 0.5f; 2355 fvalue += 0.5f;
2356 } 2356 }
2357 2357
2358 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); 2358 return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
2359 } 2359 }
2360 2360
2361 } // namespace blink 2361 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/StyleRareNonInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698