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

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: Rebase expectations for bug2886-2.html 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
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 return; 385 return;
386 case CSSPropertyFloodColor: 386 case CSSPropertyFloodColor:
387 style->setFloodColor(toAnimatableColor(value)->color()); 387 style->setFloodColor(toAnimatableColor(value)->color());
388 return; 388 return;
389 case CSSPropertyFloodOpacity: 389 case CSSPropertyFloodOpacity:
390 style->setFloodOpacity(clampTo<float>(toAnimatableDouble(value)->toDoubl e(), 0, 1)); 390 style->setFloodOpacity(clampTo<float>(toAnimatableDouble(value)->toDoubl e(), 0, 1));
391 return; 391 return;
392 case CSSPropertyFontSize: 392 case CSSPropertyFontSize:
393 state.fontBuilder().setSize(animatableValueToFontSize(value)); 393 state.fontBuilder().setSize(animatableValueToFontSize(value));
394 return; 394 return;
395 case CSSPropertyFontSizeAdjust:
396 state.fontBuilder().setSizeAdjust(clampTo<float>(toAnimatableDouble(valu e)->toDouble(), 0));
397 return;
395 case CSSPropertyFontStretch: 398 case CSSPropertyFontStretch:
396 state.fontBuilder().setStretch(animatableValueToFontStretch(value)); 399 state.fontBuilder().setStretch(animatableValueToFontStretch(value));
397 return; 400 return;
398 case CSSPropertyFontWeight: 401 case CSSPropertyFontWeight:
399 state.fontBuilder().setWeight(animatableValueToFontWeight(value)); 402 state.fontBuilder().setWeight(animatableValueToFontWeight(value));
400 return; 403 return;
401 case CSSPropertyHeight: 404 case CSSPropertyHeight:
402 style->setHeight(animatableValueToLength(value, state, ValueRangeNonNega tive)); 405 style->setHeight(animatableValueToLength(value, state, ValueRangeNonNega tive));
403 return; 406 return;
404 case CSSPropertyLeft: 407 case CSSPropertyLeft:
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 case CSSPropertyRy: 652 case CSSPropertyRy:
650 style->setRy(animatableValueToLength(value, state, ValueRangeNonNegative )); 653 style->setRy(animatableValueToLength(value, state, ValueRangeNonNegative ));
651 return; 654 return;
652 655
653 default: 656 default:
654 ASSERT_NOT_REACHED(); 657 ASSERT_NOT_REACHED();
655 } 658 }
656 } 659 }
657 660
658 } // namespace blink 661 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/resolver/FontBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698