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

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

Issue 1588993005: Extended error reporting for SVG attribute parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add PLATFORM_EXPORT Created 4 years, 11 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) 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 } 65 }
66 66
67 SVGParsingError SVGEnumerationBase::setValueAsString(const String& string) 67 SVGParsingError SVGEnumerationBase::setValueAsString(const String& string)
68 { 68 {
69 for (const auto& entry : m_entries) { 69 for (const auto& entry : m_entries) {
70 if (string == entry.second) { 70 if (string == entry.second) {
71 // 0 corresponds to _UNKNOWN enumeration values, and should not be s ettable. 71 // 0 corresponds to _UNKNOWN enumeration values, and should not be s ettable.
72 ASSERT(entry.first); 72 ASSERT(entry.first);
73 m_value = entry.first; 73 m_value = entry.first;
74 notifyChange(); 74 notifyChange();
75 return NoError; 75 return SVGParseStatus::NoError;
76 } 76 }
77 } 77 }
78 78
79 notifyChange(); 79 notifyChange();
80 return ParsingAttributeFailedError; 80 return SVGParseStatus::ExpectedEnumeration;
81 } 81 }
82 82
83 void SVGEnumerationBase::add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement *) 83 void SVGEnumerationBase::add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement *)
84 { 84 {
85 ASSERT_NOT_REACHED(); 85 ASSERT_NOT_REACHED();
86 } 86 }
87 87
88 void SVGEnumerationBase::calculateAnimatedValue(SVGAnimationElement* animationEl ement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropert yBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr< SVGPropertyBase>, SVGElement*) 88 void SVGEnumerationBase::calculateAnimatedValue(SVGAnimationElement* animationEl ement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropert yBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr< SVGPropertyBase>, SVGElement*)
89 { 89 {
90 ASSERT(animationElement); 90 ASSERT(animationElement);
91 unsigned short fromEnumeration = animationElement->animationMode() == ToAnim ation ? m_value : toSVGEnumerationBase(from)->value(); 91 unsigned short fromEnumeration = animationElement->animationMode() == ToAnim ation ? m_value : toSVGEnumerationBase(from)->value();
92 unsigned short toEnumeration = toSVGEnumerationBase(to)->value(); 92 unsigned short toEnumeration = toSVGEnumerationBase(to)->value();
93 93
94 animationElement->animateDiscreteType<unsigned short>(percentage, fromEnumer ation, toEnumeration, m_value); 94 animationElement->animateDiscreteType<unsigned short>(percentage, fromEnumer ation, toEnumeration, m_value);
95 } 95 }
96 96
97 float SVGEnumerationBase::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBa se>, SVGElement*) 97 float SVGEnumerationBase::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBa se>, SVGElement*)
98 { 98 {
99 // No paced animations for boolean. 99 // No paced animations for boolean.
100 return -1; 100 return -1;
101 } 101 }
102 102
103 } 103 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGElement.cpp ('k') | third_party/WebKit/Source/core/svg/SVGFEConvolveMatrixElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698