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

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

Issue 1162593006: Fix crash when animating -webkit-{min,max}-content keyword (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
« no previous file with comments | « LayoutTests/animations/min-max-content-crash.html ('k') | no next file » | 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 * * Redistributions of source code must retain the above copyright 4 * * Redistributions of source code must retain the above copyright
5 * notice, this list of conditions and the following disclaimer. 5 * notice, this list of conditions and the following disclaimer.
6 * * Redistributions in binary form must reproduce the above 6 * * Redistributions in binary form must reproduce the above
7 * copyright notice, this list of conditions and the following disclaimer 7 * copyright notice, this list of conditions and the following disclaimer
8 * in the documentation and/or other materials provided with the 8 * in the documentation and/or other materials provided with the
9 * distribution. 9 * distribution.
10 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 Length StyleBuilderConverter::convertLengthSizing(StyleResolverState& state, CSS Value* value) 550 Length StyleBuilderConverter::convertLengthSizing(StyleResolverState& state, CSS Value* value)
551 { 551 {
552 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 552 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
553 switch (primitiveValue->getValueID()) { 553 switch (primitiveValue->getValueID()) {
554 case CSSValueInvalid: 554 case CSSValueInvalid:
555 return convertLength(state, value); 555 return convertLength(state, value);
556 case CSSValueIntrinsic: 556 case CSSValueIntrinsic:
557 return Length(Intrinsic); 557 return Length(Intrinsic);
558 case CSSValueMinIntrinsic: 558 case CSSValueMinIntrinsic:
559 return Length(MinIntrinsic); 559 return Length(MinIntrinsic);
560 case CSSValueMinContent:
560 case CSSValueWebkitMinContent: 561 case CSSValueWebkitMinContent:
561 return Length(MinContent); 562 return Length(MinContent);
563 case CSSValueMaxContent:
562 case CSSValueWebkitMaxContent: 564 case CSSValueWebkitMaxContent:
563 return Length(MaxContent); 565 return Length(MaxContent);
564 case CSSValueWebkitFillAvailable: 566 case CSSValueWebkitFillAvailable:
565 return Length(FillAvailable); 567 return Length(FillAvailable);
566 case CSSValueWebkitFitContent: 568 case CSSValueWebkitFitContent:
567 return Length(FitContent); 569 return Length(FitContent);
568 case CSSValueAuto: 570 case CSSValueAuto:
569 return Length(Auto); 571 return Length(Auto);
570 default: 572 default:
571 ASSERT_NOT_REACHED(); 573 ASSERT_NOT_REACHED();
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 CSSPrimitiveValue* primitiveValueZ = toCSSPrimitiveValue(list->item(2)); 897 CSSPrimitiveValue* primitiveValueZ = toCSSPrimitiveValue(list->item(2));
896 898
897 return TransformOrigin( 899 return TransformOrigin(
898 convertOriginLength<CSSValueLeft, CSSValueRight>(state, primitiveValueX) , 900 convertOriginLength<CSSValueLeft, CSSValueRight>(state, primitiveValueX) ,
899 convertOriginLength<CSSValueTop, CSSValueBottom>(state, primitiveValueY) , 901 convertOriginLength<CSSValueTop, CSSValueBottom>(state, primitiveValueY) ,
900 StyleBuilderConverter::convertComputedLength<float>(state, primitiveValu eZ) 902 StyleBuilderConverter::convertComputedLength<float>(state, primitiveValu eZ)
901 ); 903 );
902 } 904 }
903 905
904 } // namespace blink 906 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/animations/min-max-content-crash.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698