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

Side by Side Diff: Source/core/animation/css/CSSPropertyEquality.cpp

Issue 203523002: Reland "Add plumbing for font-stretch" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: w/fix for ASSERT Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/animation/css/CSSPropertyEquality.h" 6 #include "core/animation/css/CSSPropertyEquality.h"
7 7
8 #include "core/animation/css/CSSAnimations.h" 8 #include "core/animation/css/CSSAnimations.h"
9 #include "core/rendering/style/DataEquivalency.h" 9 #include "core/rendering/style/DataEquivalency.h"
10 #include "core/rendering/style/RenderStyle.h" 10 #include "core/rendering/style/RenderStyle.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 case CSSPropertyFloodColor: 135 case CSSPropertyFloodColor:
136 return a.floodColor() == b.floodColor(); 136 return a.floodColor() == b.floodColor();
137 case CSSPropertyFloodOpacity: 137 case CSSPropertyFloodOpacity:
138 return a.floodOpacity() == b.floodOpacity(); 138 return a.floodOpacity() == b.floodOpacity();
139 case CSSPropertyFontSize: 139 case CSSPropertyFontSize:
140 // CSSPropertyFontSize: Must pass a specified size to setFontSize if Tex t Autosizing is enabled, but a computed size 140 // CSSPropertyFontSize: Must pass a specified size to setFontSize if Tex t Autosizing is enabled, but a computed size
141 // if text zoom is enabled (if neither is enabled it's irrelevant as the y're probably the same). 141 // if text zoom is enabled (if neither is enabled it's irrelevant as the y're probably the same).
142 // FIXME: Should we introduce an option to pass the computed font size h ere, allowing consumers to 142 // FIXME: Should we introduce an option to pass the computed font size h ere, allowing consumers to
143 // enable text zoom rather than Text Autosizing? See http://crbug.com/22 7545. 143 // enable text zoom rather than Text Autosizing? See http://crbug.com/22 7545.
144 return a.specifiedFontSize() == b.specifiedFontSize(); 144 return a.specifiedFontSize() == b.specifiedFontSize();
145 case CSSPropertyFontStretch:
146 return a.fontStretch() == b.fontStretch();
145 case CSSPropertyFontWeight: 147 case CSSPropertyFontWeight:
146 return a.fontWeight() == b.fontWeight(); 148 return a.fontWeight() == b.fontWeight();
147 case CSSPropertyHeight: 149 case CSSPropertyHeight:
148 return a.height() == b.height(); 150 return a.height() == b.height();
149 case CSSPropertyLeft: 151 case CSSPropertyLeft:
150 return a.left() == b.left(); 152 return a.left() == b.left();
151 case CSSPropertyLetterSpacing: 153 case CSSPropertyLetterSpacing:
152 return a.letterSpacing() == b.letterSpacing(); 154 return a.letterSpacing() == b.letterSpacing();
153 case CSSPropertyLightingColor: 155 case CSSPropertyLightingColor:
154 return a.lightingColor() == b.lightingColor(); 156 return a.lightingColor() == b.lightingColor();
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 return a.zIndex() == b.zIndex(); 299 return a.zIndex() == b.zIndex();
298 case CSSPropertyZoom: 300 case CSSPropertyZoom:
299 return a.zoom() == b.zoom(); 301 return a.zoom() == b.zoom();
300 default: 302 default:
301 ASSERT_NOT_REACHED(); 303 ASSERT_NOT_REACHED();
302 return true; 304 return true;
303 } 305 }
304 } 306 }
305 307
306 } 308 }
OLDNEW
« no previous file with comments | « Source/core/animation/css/CSSAnimatableValueFactory.cpp ('k') | Source/core/css/CSSComputedStyleDeclaration.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698