| Index: Source/platform/geometry/FloatPoint.cpp
|
| diff --git a/Source/core/platform/graphics/FloatPoint.cpp b/Source/platform/geometry/FloatPoint.cpp
|
| similarity index 88%
|
| rename from Source/core/platform/graphics/FloatPoint.cpp
|
| rename to Source/platform/geometry/FloatPoint.cpp
|
| index d92d6abfdd05244e255b358fee57dfa954cda559..9dd1ea451081dfd61acfad93c9bbdffbe189f5f0 100644
|
| --- a/Source/core/platform/graphics/FloatPoint.cpp
|
| +++ b/Source/platform/geometry/FloatPoint.cpp
|
| @@ -25,20 +25,25 @@
|
| */
|
|
|
| #include "config.h"
|
| -#include "core/platform/graphics/FloatPoint.h"
|
| -
|
| -#include <math.h>
|
| +#include "platform/geometry/FloatPoint.h"
|
| +
|
| +#include "SkPoint.h"
|
| +#include "platform/FloatConversion.h"
|
| +#include "platform/geometry/IntPoint.h"
|
| +#include "platform/geometry/LayoutPoint.h"
|
| +#include "platform/geometry/LayoutSize.h"
|
| +#include "platform/transforms/AffineTransform.h"
|
| +#include "platform/transforms/TransformationMatrix.h"
|
| #include <limits>
|
| -#include "core/platform/FloatConversion.h"
|
| -#include "core/platform/graphics/IntPoint.h"
|
| -#include "core/platform/graphics/LayoutPoint.h"
|
| -#include "core/platform/graphics/LayoutSize.h"
|
| -#include "core/platform/graphics/skia/SkiaUtils.h"
|
| -#include "core/platform/graphics/transforms/AffineTransform.h"
|
| -#include "core/platform/graphics/transforms/TransformationMatrix.h"
|
| -#include "third_party/skia/include/core/SkPoint.h"
|
| +#include <math.h>
|
|
|
| namespace WebCore {
|
| +
|
| +// Skia has problems when passed infinite, etc floats, filter them to 0.
|
| +static inline SkScalar WebCoreFloatToSkScalar(float f)
|
| +{
|
| + return SkFloatToScalar(std::isfinite(f) ? f : 0);
|
| +}
|
|
|
| FloatPoint::FloatPoint(const IntPoint& p) : m_x(p.x()), m_y(p.y())
|
| {
|
|
|