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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGPath.cpp

Issue 1743863002: Rename enums/functions that collide in chromium style in core/svg,xml (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-10: rebase Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org> 2 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde .org>
3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org> 3 * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
5 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 || byteStream().isEmpty() 115 || byteStream().isEmpty()
116 || otherPathByteStream.isEmpty()) 116 || otherPathByteStream.isEmpty())
117 return; 117 return;
118 118
119 m_pathValue = CSSPathValue::create(addPathByteStreams(byteStream(), otherPat hByteStream)); 119 m_pathValue = CSSPathValue::create(addPathByteStreams(byteStream(), otherPat hByteStream));
120 } 120 }
121 121
122 void SVGPath::calculateAnimatedValue(SVGAnimationElement* animationElement, floa t percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from Value, PassRefPtrWillBeRawPtr<SVGPropertyBase> toValue, PassRefPtrWillBeRawPtr<S VGPropertyBase> toAtEndOfDurationValue, SVGElement*) 122 void SVGPath::calculateAnimatedValue(SVGAnimationElement* animationElement, floa t percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> from Value, PassRefPtrWillBeRawPtr<SVGPropertyBase> toValue, PassRefPtrWillBeRawPtr<S VGPropertyBase> toAtEndOfDurationValue, SVGElement*)
123 { 123 {
124 ASSERT(animationElement); 124 ASSERT(animationElement);
125 bool isToAnimation = animationElement->animationMode() == ToAnimation; 125 bool isToAnimation = animationElement->getAnimationMode() == ToAnimation;
126 126
127 const SVGPath& to = toSVGPath(*toValue); 127 const SVGPath& to = toSVGPath(*toValue);
128 const SVGPathByteStream& toStream = to.byteStream(); 128 const SVGPathByteStream& toStream = to.byteStream();
129 129
130 // If no 'to' value is given, nothing to animate. 130 // If no 'to' value is given, nothing to animate.
131 if (!toStream.size()) 131 if (!toStream.size())
132 return; 132 return;
133 133
134 const SVGPath& from = toSVGPath(*fromValue); 134 const SVGPath& from = toSVGPath(*fromValue);
135 const SVGPathByteStream* fromStream = &from.byteStream(); 135 const SVGPathByteStream* fromStream = &from.byteStream();
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 return -1; 172 return -1;
173 } 173 }
174 174
175 DEFINE_TRACE(SVGPath) 175 DEFINE_TRACE(SVGPath)
176 { 176 {
177 visitor->trace(m_pathValue); 177 visitor->trace(m_pathValue);
178 SVGPropertyBase::trace(visitor); 178 SVGPropertyBase::trace(visitor);
179 } 179 }
180 180
181 } // namespace blink 181 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGNumberList.cpp ('k') | third_party/WebKit/Source/core/svg/SVGPointList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698