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

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

Issue 444803002: Removed -webkit-marquee-increment leftovers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased 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 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 } 895 }
896 } 896 }
897 897
898 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFilter(StyleResolverState & state, CSSValue* value) 898 void StyleBuilderFunctions::applyValueCSSPropertyWebkitFilter(StyleResolverState & state, CSSValue* value)
899 { 899 {
900 FilterOperations operations; 900 FilterOperations operations;
901 if (FilterOperationResolver::createFilterOperations(value, state.cssToLength ConversionData(), operations, state)) 901 if (FilterOperationResolver::createFilterOperations(value, state.cssToLength ConversionData(), operations, state))
902 state.style()->setFilter(operations); 902 state.style()->setFilter(operations);
903 } 903 }
904 904
905 void StyleBuilderFunctions::applyValueCSSPropertyInternalMarqueeIncrement(StyleR esolverState& state, CSSValue* value)
906 {
907 if (!value->isPrimitiveValue())
908 return;
909
910 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
911 if (primitiveValue->getValueID()) {
912 switch (primitiveValue->getValueID()) {
913 case CSSValueSmall:
914 state.style()->setMarqueeIncrement(Length(1, Fixed)); // 1px.
915 break;
916 case CSSValueNormal:
917 state.style()->setMarqueeIncrement(Length(6, Fixed)); // 6px. The Wi nIE default.
918 break;
919 case CSSValueLarge:
920 state.style()->setMarqueeIncrement(Length(36, Fixed)); // 36px.
921 break;
922 default:
923 break;
924 }
925 } else {
926 Length marqueeLength = primitiveValue->convertToLength<FixedConversion | PercentConversion>(state.cssToLengthConversionData());
927 state.style()->setMarqueeIncrement(marqueeLength);
928 }
929 }
930
931 void StyleBuilderFunctions::applyValueCSSPropertyInternalMarqueeSpeed(StyleResol verState& state, CSSValue* value) 905 void StyleBuilderFunctions::applyValueCSSPropertyInternalMarqueeSpeed(StyleResol verState& state, CSSValue* value)
932 { 906 {
933 if (!value->isPrimitiveValue()) 907 if (!value->isPrimitiveValue())
934 return; 908 return;
935 909
936 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value); 910 CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
937 if (CSSValueID valueID = primitiveValue->getValueID()) { 911 if (CSSValueID valueID = primitiveValue->getValueID()) {
938 switch (valueID) { 912 switch (valueID) {
939 case CSSValueSlow: 913 case CSSValueSlow:
940 state.style()->setMarqueeSpeed(500); // 500 msec. 914 state.style()->setMarqueeSpeed(500); // 500 msec.
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
1398 break; 1372 break;
1399 default: 1373 default:
1400 ASSERT_NOT_REACHED(); 1374 ASSERT_NOT_REACHED();
1401 break; 1375 break;
1402 } 1376 }
1403 1377
1404 state.style()->setGridAutoFlow(autoFlow); 1378 state.style()->setGridAutoFlow(autoFlow);
1405 } 1379 }
1406 1380
1407 } // namespace blink 1381 } // 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