Merge SVGColor into SVGPaint

Source/core/svg/SVGAnimatedColor.cpp

 /*
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 
 #include "core/svg/SVGAnimatedColor.h"
 
 #include "core/rendering/RenderObject.h"
 #include "core/svg/ColorDistance.h"
 #include "core/svg/SVGAnimateElement.h"
-#include "core/svg/SVGColor.h"
 
 namespace WebCore {
 
 String SVGColorProperty::valueAsString() const
 {
     return m_styleColor.isCurrentColor() ? "currentColor" : m_styleColor.color().serializedAsCSSComponentValue();
 }
 
 PassRefPtr<NewSVGPropertyBase> SVGColorProperty::cloneForAnimation(const String&) const
 {
@@ skipping 55 matching lines @@
 {
     ASSERT(contextElement);
     Color fallbackColor = fallbackColorForCurrentColor(contextElement);
 
     Color fromColor = m_styleColor.resolve(fallbackColor);
     Color toColor = toSVGColorProperty(toValue)->m_styleColor.resolve(fallbackColor);
     return ColorDistance::distance(fromColor, toColor);
 }
 
 }