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

Side by Side Diff: Source/core/svg/SVGAnimatedColor.h

Issue 1224223003: Fold CSSParser::colorFromRGBColorString into only user (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/css/parser/CSSParser.cpp ('k') | Source/core/svg/SVGAnimatedColor.cpp » ('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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 24 matching lines...) Expand all
35 #include "core/svg/properties/SVGAnimatedProperty.h" 35 #include "core/svg/properties/SVGAnimatedProperty.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class SVGAnimationElement; 39 class SVGAnimationElement;
40 40
41 // StyleColor adaptor to SVGPropertyBase. This is only used for SMIL animations. 41 // StyleColor adaptor to SVGPropertyBase. This is only used for SMIL animations.
42 // FIXME: WebAnimations: Replacable with AnimatableColor once SMIL animations ar e implemented in WebAnimations. 42 // FIXME: WebAnimations: Replacable with AnimatableColor once SMIL animations ar e implemented in WebAnimations.
43 class SVGColorProperty final : public SVGPropertyBase { 43 class SVGColorProperty final : public SVGPropertyBase {
44 public: 44 public:
45 static PassRefPtrWillBeRawPtr<SVGColorProperty> create(StyleColor styleColor ) 45 static PassRefPtrWillBeRawPtr<SVGColorProperty> create(const String& colorSt ring)
46 { 46 {
47 return adoptRefWillBeNoop(new SVGColorProperty(styleColor)); 47 return adoptRefWillBeNoop(new SVGColorProperty(colorString));
48 } 48 }
49 49
50 PassRefPtrWillBeRawPtr<SVGPropertyBase> cloneForAnimation(const String&) con st override; 50 PassRefPtrWillBeRawPtr<SVGPropertyBase> cloneForAnimation(const String&) con st override;
51 String valueAsString() const override; 51 String valueAsString() const override;
52 52
53 void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) override; 53 void add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement*) override;
54 void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from, PassRefPtrWillBeRawP tr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDuratio nValue, SVGElement*) override; 54 void calculateAnimatedValue(SVGAnimationElement*, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from, PassRefPtrWillBeRawP tr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropertyBase> toAtEndOfDuratio nValue, SVGElement*) override;
55 float calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGEleme nt*) override; 55 float calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> to, SVGEleme nt*) override;
56 56
57 static AnimatedPropertyType classType() { return AnimatedColor; } 57 static AnimatedPropertyType classType() { return AnimatedColor; }
58 58
59 private: 59 private:
60 explicit SVGColorProperty(StyleColor styleColor) 60 explicit SVGColorProperty(const String&);
61 : SVGPropertyBase(classType())
62 , m_styleColor(styleColor)
63 {
64 }
65 61
66 StyleColor m_styleColor; 62 StyleColor m_styleColor;
67 }; 63 };
68 64
69 inline PassRefPtrWillBeRawPtr<SVGColorProperty> toSVGColorProperty(PassRefPtrWil lBeRawPtr<SVGPropertyBase> passBase) 65 inline PassRefPtrWillBeRawPtr<SVGColorProperty> toSVGColorProperty(PassRefPtrWil lBeRawPtr<SVGPropertyBase> passBase)
70 { 66 {
71 RefPtrWillBeRawPtr<SVGPropertyBase> base = passBase; 67 RefPtrWillBeRawPtr<SVGPropertyBase> base = passBase;
72 ASSERT(base->type() == SVGColorProperty::classType()); 68 ASSERT(base->type() == SVGColorProperty::classType());
73 return static_pointer_cast<SVGColorProperty>(base.release()); 69 return static_pointer_cast<SVGColorProperty>(base.release());
74 } 70 }
75 71
76 } // namespace blink 72 } // namespace blink
77 73
78 #endif // SVGAnimatedColor_h 74 #endif // SVGAnimatedColor_h
OLDNEW
« no previous file with comments | « Source/core/css/parser/CSSParser.cpp ('k') | Source/core/svg/SVGAnimatedColor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698