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

Unified Diff: Source/core/platform/graphics/FloatPoint.cpp

Issue 25494003: Move geometry classes from core/platform/graphics to platform/geometry (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/platform/graphics/FloatPoint.h ('k') | Source/core/platform/graphics/FloatPoint3D.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/FloatPoint.cpp
diff --git a/Source/core/platform/graphics/FloatPoint.cpp b/Source/core/platform/graphics/FloatPoint.cpp
deleted file mode 100644
index d92d6abfdd05244e255b358fee57dfa954cda559..0000000000000000000000000000000000000000
--- a/Source/core/platform/graphics/FloatPoint.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2005 Nokia. 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/FloatPoint.h"
-
-#include <math.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"
-
-namespace WebCore {
-
-FloatPoint::FloatPoint(const IntPoint& p) : m_x(p.x()), m_y(p.y())
-{
-}
-
-FloatPoint::FloatPoint(const LayoutPoint& p) : m_x(p.x()), m_y(p.y())
-{
-}
-
-void FloatPoint::normalize()
-{
- float tempLength = length();
-
- if (tempLength) {
- m_x /= tempLength;
- m_y /= tempLength;
- }
-}
-
-float FloatPoint::slopeAngleRadians() const
-{
- return atan2f(m_y, m_x);
-}
-
-float FloatPoint::length() const
-{
- return sqrtf(lengthSquared());
-}
-
-void FloatPoint::move(const LayoutSize& size)
-{
- m_x += size.width();
- m_y += size.height();
-}
-
-void FloatPoint::moveBy(const LayoutPoint& point)
-{
- m_x += point.x();
- m_y += point.y();
-}
-
-FloatPoint::operator SkPoint() const
-{
- SkPoint p = { WebCoreFloatToSkScalar(m_x), WebCoreFloatToSkScalar(m_y) };
- return p;
-}
-
-FloatPoint FloatPoint::matrixTransform(const AffineTransform& transform) const
-{
- double newX, newY;
- transform.map(static_cast<double>(m_x), static_cast<double>(m_y), newX, newY);
- return narrowPrecision(newX, newY);
-}
-
-FloatPoint FloatPoint::matrixTransform(const TransformationMatrix& transform) const
-{
- double newX, newY;
- transform.map(static_cast<double>(m_x), static_cast<double>(m_y), newX, newY);
- return narrowPrecision(newX, newY);
-}
-
-FloatPoint FloatPoint::narrowPrecision(double x, double y)
-{
- return FloatPoint(narrowPrecisionToFloat(x), narrowPrecisionToFloat(y));
-}
-
-float findSlope(const FloatPoint& p1, const FloatPoint& p2, float& c)
-{
- if (p2.x() == p1.x())
- return std::numeric_limits<float>::infinity();
-
- // y = mx + c
- float slope = (p2.y() - p1.y()) / (p2.x() - p1.x());
- c = p1.y() - slope * p1.x();
- return slope;
-}
-
-bool findIntersection(const FloatPoint& p1, const FloatPoint& p2, const FloatPoint& d1, const FloatPoint& d2, FloatPoint& intersection)
-{
- float pOffset = 0;
- float pSlope = findSlope(p1, p2, pOffset);
-
- float dOffset = 0;
- float dSlope = findSlope(d1, d2, dOffset);
-
- if (dSlope == pSlope)
- return false;
-
- if (pSlope == std::numeric_limits<float>::infinity()) {
- intersection.setX(p1.x());
- intersection.setY(dSlope * intersection.x() + dOffset);
- return true;
- }
- if (dSlope == std::numeric_limits<float>::infinity()) {
- intersection.setX(d1.x());
- intersection.setY(pSlope * intersection.x() + pOffset);
- return true;
- }
-
- // Find x at intersection, where ys overlap; x = (c' - c) / (m - m')
- intersection.setX((dOffset - pOffset) / (pSlope - dSlope));
- intersection.setY(pSlope * intersection.x() + pOffset);
- return true;
-}
-
-}
« no previous file with comments | « Source/core/platform/graphics/FloatPoint.h ('k') | Source/core/platform/graphics/FloatPoint3D.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698