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

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

Issue 1169003002: Fix animation of auto for -webkit-column-count and -webkit-column-width (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 /* 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 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 return createFromLength(style.top(), style); 471 return createFromLength(style.top(), style);
472 case CSSPropertyWebkitBorderHorizontalSpacing: 472 case CSSPropertyWebkitBorderHorizontalSpacing:
473 return createFromDouble(style.horizontalBorderSpacing()); 473 return createFromDouble(style.horizontalBorderSpacing());
474 case CSSPropertyWebkitBorderVerticalSpacing: 474 case CSSPropertyWebkitBorderVerticalSpacing:
475 return createFromDouble(style.verticalBorderSpacing()); 475 return createFromDouble(style.verticalBorderSpacing());
476 case CSSPropertyWebkitClipPath: 476 case CSSPropertyWebkitClipPath:
477 if (ClipPathOperation* operation = style.clipPath()) 477 if (ClipPathOperation* operation = style.clipPath())
478 return AnimatableClipPathOperation::create(operation); 478 return AnimatableClipPathOperation::create(operation);
479 return AnimatableUnknown::create(CSSValueNone); 479 return AnimatableUnknown::create(CSSValueNone);
480 case CSSPropertyWebkitColumnCount: 480 case CSSPropertyWebkitColumnCount:
481 if (style.hasAutoColumnCount())
482 return AnimatableUnknown::create(CSSValueAuto);
481 return createFromDouble(style.columnCount()); 483 return createFromDouble(style.columnCount());
482 case CSSPropertyWebkitColumnGap: 484 case CSSPropertyWebkitColumnGap:
483 return createFromDouble(style.columnGap()); 485 return createFromDouble(style.columnGap());
484 case CSSPropertyWebkitColumnRuleColor: 486 case CSSPropertyWebkitColumnRuleColor:
485 return createFromColor(property, style); 487 return createFromColor(property, style);
486 case CSSPropertyWebkitColumnRuleWidth: 488 case CSSPropertyWebkitColumnRuleWidth:
487 return createFromDouble(style.columnRuleWidth()); 489 return createFromDouble(style.columnRuleWidth());
488 case CSSPropertyWebkitColumnWidth: 490 case CSSPropertyWebkitColumnWidth:
491 if (style.hasAutoColumnWidth())
492 return AnimatableUnknown::create(CSSValueAuto);
489 return createFromDouble(style.columnWidth()); 493 return createFromDouble(style.columnWidth());
490 case CSSPropertyWebkitFilter: 494 case CSSPropertyWebkitFilter:
491 return AnimatableFilterOperations::create(style.filter()); 495 return AnimatableFilterOperations::create(style.filter());
492 case CSSPropertyWebkitMaskBoxImageOutset: 496 case CSSPropertyWebkitMaskBoxImageOutset:
493 return createFromBorderImageLengthBox(style.maskBoxImageOutset(), style) ; 497 return createFromBorderImageLengthBox(style.maskBoxImageOutset(), style) ;
494 case CSSPropertyWebkitMaskBoxImageSlice: 498 case CSSPropertyWebkitMaskBoxImageSlice:
495 return createFromLengthBoxAndBool(style.maskBoxImageSlices(), style.mask BoxImageSlicesFill(), style); 499 return createFromLengthBoxAndBool(style.maskBoxImageSlices(), style.mask BoxImageSlicesFill(), style);
496 case CSSPropertyWebkitMaskBoxImageSource: 500 case CSSPropertyWebkitMaskBoxImageSource:
497 return createFromStyleImage(style.maskBoxImageSource()); 501 return createFromStyleImage(style.maskBoxImageSource());
498 case CSSPropertyWebkitMaskBoxImageWidth: 502 case CSSPropertyWebkitMaskBoxImageWidth:
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 return createFromLength(style.svgStyle().ry(), style); 567 return createFromLength(style.svgStyle().ry(), style);
564 case CSSPropertyZIndex: 568 case CSSPropertyZIndex:
565 return createFromDouble(style.zIndex()); 569 return createFromDouble(style.zIndex());
566 default: 570 default:
567 ASSERT_NOT_REACHED(); 571 ASSERT_NOT_REACHED();
568 return nullptr; 572 return nullptr;
569 } 573 }
570 } 574 }
571 575
572 } // namespace blink 576 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698