Stricter float-to-int conversion in SVGIntegerOptionalInteger

third_party/WebKit/Source/core/svg/SVGIntegerOptionalInteger.cpp

 /*
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 34 matching lines @@
   SVGPropertyBase::trace(visitor);
 }
 
 SVGIntegerOptionalInteger* SVGIntegerOptionalInteger::clone() const {
   return SVGIntegerOptionalInteger::create(m_firstInteger->clone(),
                                            m_secondInteger->clone());
 }
 
 SVGPropertyBase* SVGIntegerOptionalInteger::cloneForAnimation(
     const String& value) const {
-  float floatX, floatY;
-  if (!parseNumberOptionalNumber(value, floatX, floatY)) {
-    return SVGIntegerOptionalInteger::create(SVGInteger::create(0),
-                                             SVGInteger::create(0));
-  }
-
-  int x = static_cast<int>(roundf(floatX));
-  int y = static_cast<int>(roundf(floatY));
-
-  return SVGIntegerOptionalInteger::create(SVGInteger::create(x),
-                                           SVGInteger::create(y));
+  SVGIntegerOptionalInteger* clone =
+      create(SVGInteger::create(0), SVGInteger::create(0));
+  clone->setValueAsString(value);
+  return clone;
 }
 
 String SVGIntegerOptionalInteger::valueAsString() const {
   if (m_firstInteger->value() == m_secondInteger->value()) {
     return String::number(m_firstInteger->value());
   }
 
   return String::number(m_firstInteger->value()) + " " +
          String::number(m_secondInteger->value());
 }
 
 SVGParsingError SVGIntegerOptionalInteger::setValueAsString(
     const String& value) {
   float x, y;
   SVGParsingError parseStatus;
   if (!parseNumberOptionalNumber(value, x, y)) {
     parseStatus = SVGParseStatus::ExpectedInteger;
     x = y = 0;
   }
 
-  m_firstInteger->setValue(x);
-  m_secondInteger->setValue(y);
+  m_firstInteger->setValue(clampTo<int>(x));
+  m_secondInteger->setValue(clampTo<int>(y));
   return parseStatus;
 }
 
 void SVGIntegerOptionalInteger::add(SVGPropertyBase* other, SVGElement*) {
   SVGIntegerOptionalInteger* otherIntegerOptionalInteger =
       toSVGIntegerOptionalInteger(other);
 
   m_firstInteger->setValue(
       m_firstInteger->value() +
       otherIntegerOptionalInteger->m_firstInteger->value());
@@ skipping 20 matching lines @@
   float x = m_firstInteger->value();
   float y = m_secondInteger->value();
   animationElement->animateAdditiveNumber(
       percentage, repeatCount, fromInteger->firstInteger()->value(),
       toInteger->firstInteger()->value(),
       toAtEndOfDurationInteger->firstInteger()->value(), x);
   animationElement->animateAdditiveNumber(
       percentage, repeatCount, fromInteger->secondInteger()->value(),
       toInteger->secondInteger()->value(),
       toAtEndOfDurationInteger->secondInteger()->value(), y);
-  m_firstInteger->setValue(static_cast<int>(roundf(x)));
-  m_secondInteger->setValue(static_cast<int>(roundf(y)));
+  m_firstInteger->setValue(clampTo<int>(roundf(x)));
+  m_secondInteger->setValue(clampTo<int>(roundf(y)));
 }
 
 float SVGIntegerOptionalInteger::calculateDistance(SVGPropertyBase* other,
                                                    SVGElement*) {
   // FIXME: Distance calculation is not possible for SVGIntegerOptionalInteger
   // right now. We need the distance for every single value.
   return -1;
 }
 
 }  // namespace blink