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

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

Issue 2871463002: Move StyleRareInheritedData accessors to be inline in ComputedStyle. (Closed)
Patch Set: Created 3 years, 7 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 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1065 (rare_non_inherited_data_->text_decoration_style_ != 1065 (rare_non_inherited_data_->text_decoration_style_ !=
1066 other.rare_non_inherited_data_->text_decoration_style_ || 1066 other.rare_non_inherited_data_->text_decoration_style_ ||
1067 rare_non_inherited_data_->text_decoration_color_ != 1067 rare_non_inherited_data_->text_decoration_color_ !=
1068 other.rare_non_inherited_data_->text_decoration_color_ || 1068 other.rare_non_inherited_data_->text_decoration_color_ ||
1069 rare_non_inherited_data_->visited_link_text_decoration_color_ != 1069 rare_non_inherited_data_->visited_link_text_decoration_color_ !=
1070 other.rare_non_inherited_data_ 1070 other.rare_non_inherited_data_
1071 ->visited_link_text_decoration_color_)) { 1071 ->visited_link_text_decoration_color_)) {
1072 diff.SetTextDecorationOrColorChanged(); 1072 diff.SetTextDecorationOrColorChanged();
1073 } else { 1073 } else {
1074 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get() && 1074 if (rare_inherited_data_.Get() != other.rare_inherited_data_.Get() &&
1075 (rare_inherited_data_->TextFillColor() != 1075 (TextFillColor() != other.TextFillColor() ||
Bugs Nash 2017/05/09 23:55:00 much nicer!
1076 other.rare_inherited_data_->TextFillColor() || 1076 TextStrokeColor() != other.TextStrokeColor() ||
1077 rare_inherited_data_->TextStrokeColor() != 1077 TextEmphasisColor() != other.TextEmphasisColor() ||
1078 other.rare_inherited_data_->TextStrokeColor() || 1078 VisitedLinkTextFillColor() != other.VisitedLinkTextFillColor() ||
1079 rare_inherited_data_->TextEmphasisColor() != 1079 VisitedLinkTextStrokeColor() !=
1080 other.rare_inherited_data_->TextEmphasisColor() || 1080 other.VisitedLinkTextStrokeColor() ||
1081 rare_inherited_data_->VisitedLinkTextFillColor() != 1081 VisitedLinkTextEmphasisColor() !=
1082 other.rare_inherited_data_->VisitedLinkTextFillColor() || 1082 other.VisitedLinkTextEmphasisColor() ||
1083 rare_inherited_data_->VisitedLinkTextStrokeColor() !=
1084 other.rare_inherited_data_->VisitedLinkTextStrokeColor() ||
1085 rare_inherited_data_->VisitedLinkTextEmphasisColor() !=
1086 other.rare_inherited_data_->VisitedLinkTextEmphasisColor() ||
1087 rare_inherited_data_->text_emphasis_fill != 1083 rare_inherited_data_->text_emphasis_fill !=
1088 other.rare_inherited_data_->text_emphasis_fill || 1084 other.rare_inherited_data_->text_emphasis_fill ||
1089 rare_inherited_data_->text_underline_position_ != 1085 rare_inherited_data_->text_underline_position_ !=
1090 other.rare_inherited_data_->text_underline_position_ || 1086 other.rare_inherited_data_->text_underline_position_ ||
1091 rare_inherited_data_->text_decoration_skip_ != 1087 rare_inherited_data_->text_decoration_skip_ !=
1092 other.rare_inherited_data_->text_decoration_skip_ || 1088 other.rare_inherited_data_->text_decoration_skip_ ||
1093 rare_inherited_data_->applied_text_decorations != 1089 rare_inherited_data_->applied_text_decorations !=
1094 other.rare_inherited_data_->applied_text_decorations || 1090 other.rare_inherited_data_->applied_text_decorations ||
1095 rare_inherited_data_->CaretColor() != 1091 CaretColor() != CaretColor() ||
1096 other.rare_inherited_data_->CaretColor() || 1092 VisitedLinkCaretColor() != other.VisitedLinkCaretColor())) {
1097 rare_inherited_data_->VisitedLinkCaretColor() !=
1098 other.rare_inherited_data_->VisitedLinkCaretColor())) {
1099 diff.SetTextDecorationOrColorChanged(); 1093 diff.SetTextDecorationOrColorChanged();
1100 } 1094 }
1101 } 1095 }
1102 } 1096 }
1103 } 1097 }
1104 1098
1105 bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip; 1099 bool has_clip = HasOutOfFlowPosition() && !visual_data_->has_auto_clip;
1106 bool other_has_clip = 1100 bool other_has_clip =
1107 other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip; 1101 other.HasOutOfFlowPosition() && !other.visual_data_->has_auto_clip;
1108 if (has_clip != other_has_clip || 1102 if (has_clip != other_has_clip ||
(...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after
2506 if (value < 0) 2500 if (value < 0)
2507 fvalue -= 0.5f; 2501 fvalue -= 0.5f;
2508 else 2502 else
2509 fvalue += 0.5f; 2503 fvalue += 0.5f;
2510 } 2504 }
2511 2505
2512 return RoundForImpreciseConversion<int>(fvalue / zoom_factor); 2506 return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
2513 } 2507 }
2514 2508
2515 } // namespace blink 2509 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/ComputedStyle.h ('k') | third_party/WebKit/Source/core/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698