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

Side by Side Diff: Source/core/css/CSSToStyleMap.cpp

Issue 23678004: Remove superfluous CSSLinearTimingFunctionValue (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/CSSTimingFunctionValue.cpp ('k') | Source/core/css/CSSValue.h » ('j') | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All r ights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 } 492 }
493 return; 493 return;
494 } 494 }
495 495
496 if (value->isCubicBezierTimingFunctionValue()) { 496 if (value->isCubicBezierTimingFunctionValue()) {
497 CSSCubicBezierTimingFunctionValue* cubicTimingFunction = static_cast<CSS CubicBezierTimingFunctionValue*>(value); 497 CSSCubicBezierTimingFunctionValue* cubicTimingFunction = static_cast<CSS CubicBezierTimingFunctionValue*>(value);
498 animation->setTimingFunction(CubicBezierTimingFunction::create(cubicTimi ngFunction->x1(), cubicTimingFunction->y1(), cubicTimingFunction->x2(), cubicTim ingFunction->y2())); 498 animation->setTimingFunction(CubicBezierTimingFunction::create(cubicTimi ngFunction->x1(), cubicTimingFunction->y1(), cubicTimingFunction->x2(), cubicTim ingFunction->y2()));
499 } else if (value->isStepsTimingFunctionValue()) { 499 } else if (value->isStepsTimingFunctionValue()) {
500 CSSStepsTimingFunctionValue* stepsTimingFunction = static_cast<CSSStepsT imingFunctionValue*>(value); 500 CSSStepsTimingFunctionValue* stepsTimingFunction = static_cast<CSSStepsT imingFunctionValue*>(value);
501 animation->setTimingFunction(StepsTimingFunction::create(stepsTimingFunc tion->numberOfSteps(), stepsTimingFunction->stepAtStart())); 501 animation->setTimingFunction(StepsTimingFunction::create(stepsTimingFunc tion->numberOfSteps(), stepsTimingFunction->stepAtStart()));
502 } else if (value->isLinearTimingFunctionValue()) 502 }
503 animation->setTimingFunction(LinearTimingFunction::create());
504 } 503 }
505 504
506 void CSSToStyleMap::mapNinePieceImage(RenderStyle* mutableStyle, CSSPropertyID p roperty, CSSValue* value, NinePieceImage& image) 505 void CSSToStyleMap::mapNinePieceImage(RenderStyle* mutableStyle, CSSPropertyID p roperty, CSSValue* value, NinePieceImage& image)
507 { 506 {
508 // If we're not a value list, then we are "none" and don't need to alter the empty image at all. 507 // If we're not a value list, then we are "none" and don't need to alter the empty image at all.
509 if (!value || !value->isValueList()) 508 if (!value || !value->isValueList())
510 return; 509 return;
511 510
512 // Retrieve the border image value. 511 // Retrieve the border image value.
513 CSSValueList* borderImage = toCSSValueList(value); 512 CSSValueList* borderImage = toCSSValueList(value);
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 verticalRule = SpaceImageRule; 681 verticalRule = SpaceImageRule;
683 break; 682 break;
684 default: // CSSValueRepeat 683 default: // CSSValueRepeat
685 verticalRule = RepeatImageRule; 684 verticalRule = RepeatImageRule;
686 break; 685 break;
687 } 686 }
688 image.setVerticalRule(verticalRule); 687 image.setVerticalRule(verticalRule);
689 } 688 }
690 689
691 }; 690 };
OLDNEW
« no previous file with comments | « Source/core/css/CSSTimingFunctionValue.cpp ('k') | Source/core/css/CSSValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698