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

Side by Side Diff: Source/core/css/resolver/AnimatedStyleBuilder.cpp

Issue 983073002: Make font-size-adjust animatable. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed comments Created 5 years, 9 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 return; 384 return;
385 case CSSPropertyFloodColor: 385 case CSSPropertyFloodColor:
386 style->setFloodColor(toAnimatableColor(value)->color()); 386 style->setFloodColor(toAnimatableColor(value)->color());
387 return; 387 return;
388 case CSSPropertyFloodOpacity: 388 case CSSPropertyFloodOpacity:
389 style->setFloodOpacity(clampTo<float>(toAnimatableDouble(value)->toDoubl e(), 0, 1)); 389 style->setFloodOpacity(clampTo<float>(toAnimatableDouble(value)->toDoubl e(), 0, 1));
390 return; 390 return;
391 case CSSPropertyFontSize: 391 case CSSPropertyFontSize:
392 state.fontBuilder().setSize(animatableValueToFontSize(value)); 392 state.fontBuilder().setSize(animatableValueToFontSize(value));
393 return; 393 return;
394 case CSSPropertyFontSizeAdjust:
395 state.fontBuilder().setSizeAdjust(clampTo<float>(toAnimatableDouble(valu e)->toDouble(), 0));
396 return;
394 case CSSPropertyFontStretch: 397 case CSSPropertyFontStretch:
395 state.fontBuilder().setStretch(animatableValueToFontStretch(value)); 398 state.fontBuilder().setStretch(animatableValueToFontStretch(value));
396 return; 399 return;
397 case CSSPropertyFontWeight: 400 case CSSPropertyFontWeight:
398 state.fontBuilder().setWeight(animatableValueToFontWeight(value)); 401 state.fontBuilder().setWeight(animatableValueToFontWeight(value));
399 return; 402 return;
400 case CSSPropertyHeight: 403 case CSSPropertyHeight:
401 style->setHeight(animatableValueToLength(value, state, ValueRangeNonNega tive)); 404 style->setHeight(animatableValueToLength(value, state, ValueRangeNonNega tive));
402 return; 405 return;
403 case CSSPropertyLeft: 406 case CSSPropertyLeft:
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 case CSSPropertyRy: 651 case CSSPropertyRy:
649 style->setRy(animatableValueToLength(value, state, ValueRangeNonNegative )); 652 style->setRy(animatableValueToLength(value, state, ValueRangeNonNegative ));
650 return; 653 return;
651 654
652 default: 655 default:
653 ASSERT_NOT_REACHED(); 656 ASSERT_NOT_REACHED();
654 } 657 }
655 } 658 }
656 659
657 } // namespace blink 660 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698