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

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

Issue 1420303002: Remove support for intrinsic and min-intrinsic (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 * * 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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 return Length(Auto); 544 return Length(Auto);
545 return primitiveValue.convertToLength(state.cssToLengthConversionData()); 545 return primitiveValue.convertToLength(state.cssToLengthConversionData());
546 } 546 }
547 547
548 Length StyleBuilderConverter::convertLengthSizing(StyleResolverState& state, con st CSSValue& value) 548 Length StyleBuilderConverter::convertLengthSizing(StyleResolverState& state, con st CSSValue& value)
549 { 549 {
550 const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); 550 const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
551 switch (primitiveValue.getValueID()) { 551 switch (primitiveValue.getValueID()) {
552 case CSSValueInvalid: 552 case CSSValueInvalid:
553 return convertLength(state, value); 553 return convertLength(state, value);
554 case CSSValueIntrinsic:
555 return Length(Intrinsic);
556 case CSSValueMinIntrinsic:
557 return Length(MinIntrinsic);
558 case CSSValueMinContent: 554 case CSSValueMinContent:
559 case CSSValueWebkitMinContent: 555 case CSSValueWebkitMinContent:
560 return Length(MinContent); 556 return Length(MinContent);
561 case CSSValueMaxContent: 557 case CSSValueMaxContent:
562 case CSSValueWebkitMaxContent: 558 case CSSValueWebkitMaxContent:
563 return Length(MaxContent); 559 return Length(MaxContent);
564 case CSSValueWebkitFillAvailable: 560 case CSSValueWebkitFillAvailable:
565 return Length(FillAvailable); 561 return Length(FillAvailable);
566 case CSSValueWebkitFitContent: 562 case CSSValueWebkitFitContent:
567 case CSSValueFitContent: 563 case CSSValueFitContent:
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 return ScaleTransformOperation::create(sx, sy, sz, TransformOperation::Scale 3D); 942 return ScaleTransformOperation::create(sx, sy, sz, TransformOperation::Scale 3D);
947 } 943 }
948 944
949 RespectImageOrientationEnum StyleBuilderConverter::convertImageOrientation(Style ResolverState& state, const CSSValue& value) 945 RespectImageOrientationEnum StyleBuilderConverter::convertImageOrientation(Style ResolverState& state, const CSSValue& value)
950 { 946 {
951 const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value); 947 const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
952 return primitiveValue.getValueID() == CSSValueFromImage ? RespectImageOrient ation : DoNotRespectImageOrientation; 948 return primitiveValue.getValueID() == CSSValueFromImage ? RespectImageOrient ation : DoNotRespectImageOrientation;
953 } 949 }
954 950
955 } // namespace blink 951 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp ('k') | third_party/WebKit/Source/core/frame/UseCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698