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

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

Issue 457633002: Remove left-overs from -webkit-marquee-speed removal. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Don't use time for speed. Created 6 years, 4 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 | « Source/core/css/parser/CSSPropertyParser.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 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 } 865 }
866 } 866 }
867 867
868 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFilter(StyleResolverState & state, CSSValue* value) 868 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFilter(StyleResolverState & state, CSSValue* value)
869 { 869 {
870 FilterOperations operations; 870 FilterOperations operations;
871 if (FilterOperationResolver::createFilterOperations(value, state.cssToLength ConversionData(), operations, state)) 871 if (FilterOperationResolver::createFilterOperations(value, state.cssToLength ConversionData(), operations, state))
872 state.style()->setFilter(operations); 872 state.style()->setFilter(operations);
873 } 873 }
874 874
875 void StyleBuilderFunctions::applyValueCSSPropertyInternalMarqueeSpeed(StyleResol verState& state, CSSValue* value)
876 {
877 if (!value->isPrimitiveValue())
878 return;
879
880 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
881 if (CSSValueID valueID = primitiveValue->getValueID()) {
882 switch (valueID) {
883 case CSSValueSlow:
884 state.style()->setMarqueeSpeed(500); // 500 msec.
885 break;
886 case CSSValueNormal:
887 state.style()->setMarqueeSpeed(85); // 85msec. The WinIE default.
888 break;
889 case CSSValueFast:
890 state.style()->setMarqueeSpeed(10); // 10msec. Super fast.
891 break;
892 default:
893 break;
894 }
895 } else if (primitiveValue->isTime()) {
896 state.style()->setMarqueeSpeed(static_cast<int>(primitiveValue->computeS econds()) * 1000);
897 } else if (primitiveValue->isNumber()) { // For scrollamount support.
898 state.style()->setMarqueeSpeed(primitiveValue->getIntValue());
899 }
900 }
901
902 // FIXME: We should use the same system for this as the rest of the pseudo-short hands (e.g. background-position) 875 // FIXME: We should use the same system for this as the rest of the pseudo-short hands (e.g. background-position)
903 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitPerspectiveOrigin(Style ResolverState& state) 876 void StyleBuilderFunctions::applyInitialCSSPropertyWebkitPerspectiveOrigin(Style ResolverState& state)
904 { 877 {
905 applyInitialCSSPropertyWebkitPerspectiveOriginX(state); 878 applyInitialCSSPropertyWebkitPerspectiveOriginX(state);
906 applyInitialCSSPropertyWebkitPerspectiveOriginY(state); 879 applyInitialCSSPropertyWebkitPerspectiveOriginY(state);
907 } 880 }
908 881
909 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitPerspectiveOrigin(Style ResolverState& state) 882 void StyleBuilderFunctions::applyInheritCSSPropertyWebkitPerspectiveOrigin(Style ResolverState& state)
910 { 883 {
911 applyInheritCSSPropertyWebkitPerspectiveOriginX(state); 884 applyInheritCSSPropertyWebkitPerspectiveOriginX(state);
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1322 break; 1295 break;
1323 default: 1296 default:
1324 ASSERT_NOT_REACHED(); 1297 ASSERT_NOT_REACHED();
1325 break; 1298 break;
1326 } 1299 }
1327 1300
1328 state.style()->setGridAutoFlow(autoFlow); 1301 state.style()->setGridAutoFlow(autoFlow);
1329 } 1302 }
1330 1303
1331 } // namespace blink 1304 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/parser/CSSPropertyParser.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698