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/StyleBuilderCustom.cpp

Issue 23537037: [CSS Grid Layout] Use CSS_FR for flexible lengths instead of CSS_DIMENSION (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed the FIXME :) Created 7 years, 3 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/CSSPrimitiveValue.cpp ('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 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 4 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 5 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 7 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 8 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 9 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
(...skipping 928 matching lines...) Expand 10 before | Expand all | Expand 10 after
939 return true; 939 return true;
940 } 940 }
941 941
942 if (primitiveValue->getValueID() == CSSValueMaxContent) { 942 if (primitiveValue->getValueID() == CSSValueMaxContent) {
943 workingLength = Length(MaxContent); 943 workingLength = Length(MaxContent);
944 return true; 944 return true;
945 } 945 }
946 946
947 if (primitiveValue->isFlex()) { 947 if (primitiveValue->isFlex()) {
948 // Fractional unit. 948 // Fractional unit.
949 workingLength.setFlex(primitiveValue->getFloatValue()); 949 workingLength.setFlex(primitiveValue->getDoubleValue());
950 return true; 950 return true;
951 } 951 }
952 952
953 workingLength = primitiveValue->convertToLength<FixedIntegerConversion | Per centConversion | AutoConversion>(state.style(), state.rootElementStyle(), state. style()->effectiveZoom()); 953 workingLength = primitiveValue->convertToLength<FixedIntegerConversion | Per centConversion | AutoConversion>(state.style(), state.rootElementStyle(), state. style()->effectiveZoom());
954 if (workingLength.length().isUndefined()) 954 if (workingLength.length().isUndefined())
955 return false; 955 return false;
956 956
957 if (primitiveValue->isLength()) 957 if (primitiveValue->isLength())
958 workingLength.length().setQuirk(primitiveValue->isQuirkValue()); 958 workingLength.length().setQuirk(primitiveValue->isQuirkValue());
959 959
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
2395 break; 2395 break;
2396 } 2396 }
2397 case CSSPropertyEnableBackground: 2397 case CSSPropertyEnableBackground:
2398 // Silently ignoring this property for now 2398 // Silently ignoring this property for now
2399 // http://bugs.webkit.org/show_bug.cgi?id=6022 2399 // http://bugs.webkit.org/show_bug.cgi?id=6022
2400 break; 2400 break;
2401 } 2401 }
2402 } 2402 }
2403 2403
2404 } // namespace WebCore 2404 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698