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

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

Issue 345903005: calc expressions should support time, angle and frequency values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated patch Created 6 years, 5 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/resolver/CSSToStyleMap.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 965 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 case CSSValueNormal: 976 case CSSValueNormal:
977 state.style()->setMarqueeSpeed(85); // 85msec. The WinIE default. 977 state.style()->setMarqueeSpeed(85); // 85msec. The WinIE default.
978 break; 978 break;
979 case CSSValueFast: 979 case CSSValueFast:
980 state.style()->setMarqueeSpeed(10); // 10msec. Super fast. 980 state.style()->setMarqueeSpeed(10); // 10msec. Super fast.
981 break; 981 break;
982 default: 982 default:
983 break; 983 break;
984 } 984 }
985 } else if (primitiveValue->isTime()) { 985 } else if (primitiveValue->isTime()) {
986 state.style()->setMarqueeSpeed(primitiveValue->computeTime<int, CSSPrimi tiveValue::Milliseconds>()); 986 state.style()->setMarqueeSpeed(static_cast<int>(primitiveValue->computeS econds()) * 1000);
987 } else if (primitiveValue->isNumber()) { // For scrollamount support. 987 } else if (primitiveValue->isNumber()) { // For scrollamount support.
988 state.style()->setMarqueeSpeed(primitiveValue->getIntValue()); 988 state.style()->setMarqueeSpeed(primitiveValue->getIntValue());
989 } 989 }
990 } 990 }
991 991
992 // FIXME: We should use the same system for this as the rest of the pseudo-short hands (e.g. background-position) 992 // FIXME: We should use the same system for this as the rest of the pseudo-short hands (e.g. background-position)
993 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitPerspectiveOrigin(Style ResolverState& state) 993 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitPerspectiveOrigin(Style ResolverState& state)
994 { 994 {
995 applyInitialCSSPropertyWebkitPerspectiveOriginX(state); 995 applyInitialCSSPropertyWebkitPerspectiveOriginX(state);
996 applyInitialCSSPropertyWebkitPerspectiveOriginY(state); 996 applyInitialCSSPropertyWebkitPerspectiveOriginY(state);
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1458 break; 1458 break;
1459 default: 1459 default:
1460 ASSERT_NOT_REACHED(); 1460 ASSERT_NOT_REACHED();
1461 break; 1461 break;
1462 } 1462 }
1463 1463
1464 state.style()->setGridAutoFlow(autoFlow); 1464 state.style()->setGridAutoFlow(autoFlow);
1465 } 1465 }
1466 1466
1467 } // namespace blink 1467 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/resolver/CSSToStyleMap.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698