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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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
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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 break; 474 break;
475 case CSSValueStepStart: 475 case CSSValueStepStart:
476 return StepsTimingFunction::preset(StepsTimingFunction::Start); 476 return StepsTimingFunction::preset(StepsTimingFunction::Start);
477 break; 477 break;
478 case CSSValueStepEnd: 478 case CSSValueStepEnd:
479 return StepsTimingFunction::preset(StepsTimingFunction::End); 479 return StepsTimingFunction::preset(StepsTimingFunction::End);
480 break; 480 break;
481 default: 481 default:
482 break; 482 break;
483 } 483 }
484 return 0; 484 return nullptr;
485 } 485 }
486 486
487 if (value->isCubicBezierTimingFunctionValue()) { 487 if (value->isCubicBezierTimingFunctionValue()) {
488 CSSCubicBezierTimingFunctionValue* cubicTimingFunction = toCSSCubicBezie rTimingFunctionValue(value); 488 CSSCubicBezierTimingFunctionValue* cubicTimingFunction = toCSSCubicBezie rTimingFunctionValue(value);
489 return CubicBezierTimingFunction::create(cubicTimingFunction->x1(), cubi cTimingFunction->y1(), cubicTimingFunction->x2(), cubicTimingFunction->y2()); 489 return CubicBezierTimingFunction::create(cubicTimingFunction->x1(), cubi cTimingFunction->y1(), cubicTimingFunction->x2(), cubicTimingFunction->y2());
490 } else if (value->isStepsTimingFunctionValue()) { 490 } else if (value->isStepsTimingFunctionValue()) {
491 CSSStepsTimingFunctionValue* stepsTimingFunction = toCSSStepsTimingFunct ionValue(value); 491 CSSStepsTimingFunctionValue* stepsTimingFunction = toCSSStepsTimingFunct ionValue(value);
492 return StepsTimingFunction::create(stepsTimingFunction->numberOfSteps(), stepsTimingFunction->stepAtStart()); 492 return StepsTimingFunction::create(stepsTimingFunction->numberOfSteps(), stepsTimingFunction->stepAtStart());
493 } 493 }
494 494
495 return 0; 495 return nullptr;
496 } 496 }
497 497
498 void CSSToStyleMap::mapAnimationTimingFunction(CSSAnimationData* animation, CSSV alue* value) const 498 void CSSToStyleMap::mapAnimationTimingFunction(CSSAnimationData* animation, CSSV alue* value) const
499 { 499 {
500 RefPtr<TimingFunction> timingFunction = animationTimingFunction(value, true) ; 500 RefPtr<TimingFunction> timingFunction = animationTimingFunction(value, true) ;
501 if (timingFunction) 501 if (timingFunction)
502 animation->setTimingFunction(timingFunction); 502 animation->setTimingFunction(timingFunction);
503 } 503 }
504 504
505 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)
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 verticalRule = SpaceImageRule; 664 verticalRule = SpaceImageRule;
665 break; 665 break;
666 default: // CSSValueRepeat 666 default: // CSSValueRepeat
667 verticalRule = RepeatImageRule; 667 verticalRule = RepeatImageRule;
668 break; 668 break;
669 } 669 }
670 image.setVerticalRule(verticalRule); 670 image.setVerticalRule(verticalRule);
671 } 671 }
672 672
673 }; 673 };
OLDNEW
« no previous file with comments | « Source/core/css/resolver/AnimatedStyleBuilder.cpp ('k') | Source/core/css/resolver/ElementStyleResources.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698