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

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: Do not allow font-size-adjust to animate for none or 0 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 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 return; 383 return;
384 case CSSPropertyFloodColor: 384 case CSSPropertyFloodColor:
385 style->setFloodColor(toAnimatableColor(value)->color()); 385 style->setFloodColor(toAnimatableColor(value)->color());
386 return; 386 return;
387 case CSSPropertyFloodOpacity: 387 case CSSPropertyFloodOpacity:
388 style->setFloodOpacity(clampTo<float>(toAnimatableDouble(value)->toDoubl e(), 0, 1)); 388 style->setFloodOpacity(clampTo<float>(toAnimatableDouble(value)->toDoubl e(), 0, 1));
389 return; 389 return;
390 case CSSPropertyFontSize: 390 case CSSPropertyFontSize:
391 state.fontBuilder().setSize(animatableValueToFontSize(value)); 391 state.fontBuilder().setSize(animatableValueToFontSize(value));
392 return; 392 return;
393 case CSSPropertyFontSizeAdjust:
394 state.fontBuilder().setSizeAdjust(clampTo<float>(toAnimatableDouble(valu e)->toDouble(), 0));
395 return;
393 case CSSPropertyFontStretch: 396 case CSSPropertyFontStretch:
394 state.fontBuilder().setStretch(animatableValueToFontStretch(value)); 397 state.fontBuilder().setStretch(animatableValueToFontStretch(value));
395 return; 398 return;
396 case CSSPropertyFontWeight: 399 case CSSPropertyFontWeight:
397 state.fontBuilder().setWeight(animatableValueToFontWeight(value)); 400 state.fontBuilder().setWeight(animatableValueToFontWeight(value));
398 return; 401 return;
399 case CSSPropertyHeight: 402 case CSSPropertyHeight:
400 style->setHeight(animatableValueToLength(value, state, ValueRangeNonNega tive)); 403 style->setHeight(animatableValueToLength(value, state, ValueRangeNonNega tive));
401 return; 404 return;
402 case CSSPropertyLeft: 405 case CSSPropertyLeft:
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 case CSSPropertyRy: 641 case CSSPropertyRy:
639 style->setRy(animatableValueToLength(value, state)); 642 style->setRy(animatableValueToLength(value, state));
640 return; 643 return;
641 644
642 default: 645 default:
643 ASSERT_NOT_REACHED(); 646 ASSERT_NOT_REACHED();
644 } 647 }
645 } 648 }
646 649
647 } // namespace blink 650 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698