| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 const Color& color, const Color& visitedLinkColor, | 45 const Color& color, const Color& visitedLinkColor, |
| 46 const String& uri, const String& visitedLinkURI) | 46 const String& uri, const String& visitedLinkURI) |
| 47 { | 47 { |
| 48 return create(type, visitedLinkType, AnimatableColor::create(color, visi
tedLinkColor), uri, visitedLinkURI); | 48 return create(type, visitedLinkType, AnimatableColor::create(color, visi
tedLinkColor), uri, visitedLinkURI); |
| 49 } | 49 } |
| 50 static PassRefPtr<AnimatableSVGPaint> create( | 50 static PassRefPtr<AnimatableSVGPaint> create( |
| 51 SVGPaintType type, SVGPaintType visitedLinkType, | 51 SVGPaintType type, SVGPaintType visitedLinkType, |
| 52 PassRefPtr<AnimatableColor> color, | 52 PassRefPtr<AnimatableColor> color, |
| 53 const String& uri, const String& visitedLinkURI) | 53 const String& uri, const String& visitedLinkURI) |
| 54 { | 54 { |
| 55 return adoptRef(new AnimatableSVGPaint(type, visitedLinkType, color, uri
, visitedLinkURI)); | 55 return adoptRef(new AnimatableSVGPaint(type, visitedLinkType, std::move(
color), uri, visitedLinkURI)); |
| 56 } | 56 } |
| 57 SVGPaintType paintType() const { return m_type; } | 57 SVGPaintType paintType() const { return m_type; } |
| 58 SVGPaintType visitedLinkPaintType() const { return m_visitedLinkType; } | 58 SVGPaintType visitedLinkPaintType() const { return m_visitedLinkType; } |
| 59 Color getColor() const { return m_color->getColor(); } | 59 Color getColor() const { return m_color->getColor(); } |
| 60 Color visitedLinkColor() const { return m_color->visitedLinkColor(); } | 60 Color visitedLinkColor() const { return m_color->visitedLinkColor(); } |
| 61 const String& uri() const { return m_uri; } | 61 const String& uri() const { return m_uri; } |
| 62 const String& visitedLinkURI() const { return m_visitedLinkURI; } | 62 const String& visitedLinkURI() const { return m_visitedLinkURI; } |
| 63 | 63 |
| 64 protected: | 64 protected: |
| 65 PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fra
ction) const override; | 65 PassRefPtr<AnimatableValue> interpolateTo(const AnimatableValue*, double fra
ction) const override; |
| (...skipping 17 matching lines...) Expand all Loading... |
| 83 RefPtr<AnimatableColor> m_color; | 83 RefPtr<AnimatableColor> m_color; |
| 84 String m_uri; | 84 String m_uri; |
| 85 String m_visitedLinkURI; | 85 String m_visitedLinkURI; |
| 86 }; | 86 }; |
| 87 | 87 |
| 88 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableSVGPaint, isSVGPaint()); | 88 DEFINE_ANIMATABLE_VALUE_TYPE_CASTS(AnimatableSVGPaint, isSVGPaint()); |
| 89 | 89 |
| 90 } // namespace blink | 90 } // namespace blink |
| 91 | 91 |
| 92 #endif // AnimatableSVGPaint_h | 92 #endif // AnimatableSVGPaint_h |
| OLD | NEW |