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

Side by Side Diff: third_party/WebKit/Source/platform/geometry/FloatSize.cpp

Issue 2342913003: Replace narrowPrecisionToFloat with clampTo<float> (Closed)
Patch Set: Created 4 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2003, 2006 Apple Computer, 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 "platform/geometry/FloatSize.h" 27 #include "platform/geometry/FloatSize.h"
28 28
29 #include "platform/FloatConversion.h"
30 #include "platform/geometry/IntSize.h" 29 #include "platform/geometry/IntSize.h"
31 #include "platform/geometry/LayoutSize.h" 30 #include "platform/geometry/LayoutSize.h"
31 #include "wtf/MathExtras.h"
32 #include "wtf/text/WTFString.h" 32 #include "wtf/text/WTFString.h"
33 #include <limits> 33 #include <limits>
34 #include <math.h> 34 #include <math.h>
35 35
36 namespace blink { 36 namespace blink {
37 37
38 FloatSize::FloatSize(const LayoutSize& size) 38 FloatSize::FloatSize(const LayoutSize& size)
39 : m_width(size.width().toFloat()) 39 : m_width(size.width().toFloat())
40 , m_height(size.height().toFloat()) 40 , m_height(size.height().toFloat())
41 { 41 {
42 } 42 }
43 43
44 float FloatSize::diagonalLength() const 44 float FloatSize::diagonalLength() const
45 { 45 {
46 return hypotf(m_width, m_height); 46 return hypotf(m_width, m_height);
47 } 47 }
48 48
49 bool FloatSize::isZero() const 49 bool FloatSize::isZero() const
50 { 50 {
51 return fabs(m_width) < std::numeric_limits<float>::epsilon() && fabs(m_heigh t) < std::numeric_limits<float>::epsilon(); 51 return fabs(m_width) < std::numeric_limits<float>::epsilon() && fabs(m_heigh t) < std::numeric_limits<float>::epsilon();
52 } 52 }
53 53
54 bool FloatSize::isExpressibleAsIntSize() const 54 bool FloatSize::isExpressibleAsIntSize() const
55 { 55 {
56 return isWithinIntRange(m_width) && isWithinIntRange(m_height); 56 return isWithinIntRange(m_width) && isWithinIntRange(m_height);
57 } 57 }
58 58
59 FloatSize FloatSize::narrowPrecision(double width, double height) 59 FloatSize FloatSize::narrowPrecision(double width, double height)
60 { 60 {
61 return FloatSize(narrowPrecisionToFloat(width), narrowPrecisionToFloat(heigh t)); 61 return FloatSize(clampTo<float>(width), clampTo<float>(height));
62 } 62 }
63 63
64 String FloatSize::toString() const 64 String FloatSize::toString() const
65 { 65 {
66 return String::format("%lgx%lg", width(), height()); 66 return String::format("%lgx%lg", width(), height());
67 } 67 }
68 68
69 } // namespace blink 69 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698