Move geometry classes from core/platform/graphics to platform/geometry

Source/platform/transforms/AffineTransform.cpp

 /*
  * Copyright (C) 2005, 2006 Apple Computer, Inc.  All rights reserved.
  *               2010 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2013 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
-#include "core/platform/graphics/transforms/AffineTransform.h"
+#include "platform/transforms/AffineTransform.h"
 
-#include "core/platform/FloatConversion.h"
-#include "core/platform/graphics/FloatQuad.h"
-#include "core/platform/graphics/FloatRect.h"
-#include "core/platform/graphics/IntRect.h"
-#include "core/platform/graphics/skia/SkiaUtils.h"
-
+#include "platform/FloatConversion.h"
+#include "platform/geometry/FloatQuad.h"
+#include "platform/geometry/FloatRect.h"
+#include "platform/geometry/IntRect.h"
 #include "wtf/MathExtras.h"
 
 namespace WebCore {
 
 AffineTransform::AffineTransform()
 {
     setMatrix(1, 0, 0, 1, 0, 0);
 }
 
 AffineTransform::AffineTransform(double a, double b, double c, double d, double e, double f)
@@ skipping 295 matching lines @@
 
     this->recompose(srA);
 }
 
 TransformationMatrix AffineTransform::toTransformationMatrix() const
 {
     return TransformationMatrix(m_transform[0], m_transform[1], m_transform[2],
                                 m_transform[3], m_transform[4], m_transform[5]);
 }
 
+static inline SkScalar WebCoreDoubleToSkScalar(double d)

[pdr., 2013/10/01 23:21:28]

Code duplication :(

+{
+    return SkDoubleToScalar(std::isfinite(d) ? d : 0);
+}
+
 AffineTransform::operator SkMatrix() const
 {
     SkMatrix result;
 
     result.setScaleX(WebCoreDoubleToSkScalar(a()));
     result.setSkewX(WebCoreDoubleToSkScalar(c()));
     result.setTranslateX(WebCoreDoubleToSkScalar(e()));
 
     result.setScaleY(WebCoreDoubleToSkScalar(d()));
     result.setSkewY(WebCoreDoubleToSkScalar(b()));
@@ skipping 54 matching lines @@
     this->setB(decomp.remainderB);
     this->setC(decomp.remainderC);
     this->setD(decomp.remainderD);
     this->setE(decomp.translateX);
     this->setF(decomp.translateY);
     this->rotate(rad2deg(decomp.angle));
     this->scale(decomp.scaleX, decomp.scaleY);
 }
 
 }