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

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: Fix build warrning. 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
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 988 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 case CSSValueNormal: 999 case CSSValueNormal:
1000 state.style()->setMarqueeSpeed(85); // 85msec. The WinIE default. 1000 state.style()->setMarqueeSpeed(85); // 85msec. The WinIE default.
1001 break; 1001 break;
1002 case CSSValueFast: 1002 case CSSValueFast:
1003 state.style()->setMarqueeSpeed(10); // 10msec. Super fast. 1003 state.style()->setMarqueeSpeed(10); // 10msec. Super fast.
1004 break; 1004 break;
1005 default: 1005 default:
1006 break; 1006 break;
1007 } 1007 }
1008 } else if (primitiveValue->isTime()) { 1008 } else if (primitiveValue->isTime()) {
1009 state.style()->setMarqueeSpeed(primitiveValue->computeTime<int, CSSPrimi tiveValue::Milliseconds>()); 1009 state.style()->setMarqueeSpeed(static_cast<int>(primitiveValue->computeS econds()) * 1000);
1010 } else if (primitiveValue->isNumber()) { // For scrollamount support. 1010 } else if (primitiveValue->isNumber()) { // For scrollamount support.
1011 state.style()->setMarqueeSpeed(primitiveValue->getIntValue()); 1011 state.style()->setMarqueeSpeed(primitiveValue->getIntValue());
1012 } 1012 }
1013 } 1013 }
1014 1014
1015 // FIXME: We should use the same system for this as the rest of the pseudo-short hands (e.g. background-position) 1015 // FIXME: We should use the same system for this as the rest of the pseudo-short hands (e.g. background-position)
1016 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitPerspectiveOrigin(Style ResolverState& state) 1016 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitPerspectiveOrigin(Style ResolverState& state)
1017 { 1017 {
1018 applyInitialCSSPropertyWebkitPerspectiveOriginX(state); 1018 applyInitialCSSPropertyWebkitPerspectiveOriginX(state);
1019 applyInitialCSSPropertyWebkitPerspectiveOriginY(state); 1019 applyInitialCSSPropertyWebkitPerspectiveOriginY(state);
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1481 break; 1481 break;
1482 default: 1482 default:
1483 ASSERT_NOT_REACHED(); 1483 ASSERT_NOT_REACHED();
1484 break; 1484 break;
1485 } 1485 }
1486 1486
1487 state.style()->setGridAutoFlow(autoFlow); 1487 state.style()->setGridAutoFlow(autoFlow);
1488 } 1488 }
1489 1489
1490 } // namespace WebCore 1490 } // namespace WebCore
OLDNEW
« Source/core/css/CSSPrimitiveValue.cpp ('K') | « Source/core/css/resolver/CSSToStyleMap.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698