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

Side by Side Diff: Source/platform/geometry/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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
3 * Copyright (C) 2005 Nokia. All rights reserved. 3 * Copyright (C) 2005 Nokia. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/platform/graphics/FloatPoint.h" 28 #include "platform/geometry/FloatPoint.h"
29 29
30 #include "SkPoint.h"
31 #include "platform/FloatConversion.h"
32 #include "platform/geometry/IntPoint.h"
33 #include "platform/geometry/LayoutPoint.h"
34 #include "platform/geometry/LayoutSize.h"
35 #include "platform/transforms/AffineTransform.h"
36 #include "platform/transforms/TransformationMatrix.h"
37 #include <limits>
30 #include <math.h> 38 #include <math.h>
31 #include <limits>
32 #include "core/platform/FloatConversion.h"
33 #include "core/platform/graphics/IntPoint.h"
34 #include "core/platform/graphics/LayoutPoint.h"
35 #include "core/platform/graphics/LayoutSize.h"
36 #include "core/platform/graphics/skia/SkiaUtils.h"
37 #include "core/platform/graphics/transforms/AffineTransform.h"
38 #include "core/platform/graphics/transforms/TransformationMatrix.h"
39 #include "third_party/skia/include/core/SkPoint.h"
40 39
41 namespace WebCore { 40 namespace WebCore {
41
42 // Skia has problems when passed infinite, etc floats, filter them to 0.
43 static inline SkScalar WebCoreFloatToSkScalar(float f)
44 {
45 return SkFloatToScalar(std::isfinite(f) ? f : 0);
46 }
42 47
43 FloatPoint::FloatPoint(const IntPoint& p) : m_x(p.x()), m_y(p.y()) 48 FloatPoint::FloatPoint(const IntPoint& p) : m_x(p.x()), m_y(p.y())
44 { 49 {
45 } 50 }
46 51
47 FloatPoint::FloatPoint(const LayoutPoint& p) : m_x(p.x()), m_y(p.y()) 52 FloatPoint::FloatPoint(const LayoutPoint& p) : m_x(p.x()), m_y(p.y())
48 { 53 {
49 } 54 }
50 55
51 void FloatPoint::normalize() 56 void FloatPoint::normalize()
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 return true; 143 return true;
139 } 144 }
140 145
141 // Find x at intersection, where ys overlap; x = (c' - c) / (m - m') 146 // Find x at intersection, where ys overlap; x = (c' - c) / (m - m')
142 intersection.setX((dOffset - pOffset) / (pSlope - dSlope)); 147 intersection.setX((dOffset - pOffset) / (pSlope - dSlope));
143 intersection.setY(pSlope * intersection.x() + pOffset); 148 intersection.setY(pSlope * intersection.x() + pOffset);
144 return true; 149 return true;
145 } 150 }
146 151
147 } 152 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698