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

Side by Side Diff: third_party/WebKit/Source/platform/geometry/FloatRect.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, 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 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 "platform/geometry/FloatRect.h" 27 #include "platform/geometry/FloatRect.h"
28 28
29 #include "platform/FloatConversion.h"
30 #include "platform/geometry/IntRect.h" 29 #include "platform/geometry/IntRect.h"
31 #include "platform/geometry/LayoutRect.h" 30 #include "platform/geometry/LayoutRect.h"
32 #include "third_party/skia/include/core/SkRect.h" 31 #include "third_party/skia/include/core/SkRect.h"
33 #include "ui/gfx/geometry/rect_f.h" 32 #include "ui/gfx/geometry/rect_f.h"
34 #include "wtf/MathExtras.h" 33 #include "wtf/MathExtras.h"
35 #include "wtf/text/WTFString.h" 34 #include "wtf/text/WTFString.h"
36 35
37 namespace blink { 36 namespace blink {
38 37
39 FloatRect::FloatRect(const IntRect& r) : m_location(r.location()), m_size(r.size ()) 38 FloatRect::FloatRect(const IntRect& r) : m_location(r.location()), m_size(r.size ())
(...skipping 13 matching lines...) Expand all
53 m_location.move(delta.width().toFloat(), delta.height().toFloat()); 52 m_location.move(delta.width().toFloat(), delta.height().toFloat());
54 } 53 }
55 54
56 void FloatRect::move(const IntSize& delta) 55 void FloatRect::move(const IntSize& delta)
57 { 56 {
58 m_location.move(delta.width(), delta.height()); 57 m_location.move(delta.width(), delta.height());
59 } 58 }
60 59
61 FloatRect FloatRect::narrowPrecision(double x, double y, double width, double he ight) 60 FloatRect FloatRect::narrowPrecision(double x, double y, double width, double he ight)
62 { 61 {
63 return FloatRect(narrowPrecisionToFloat(x), narrowPrecisionToFloat(y), narro wPrecisionToFloat(width), narrowPrecisionToFloat(height)); 62 return FloatRect(clampTo<float>(x), clampTo<float>(y), clampTo<float>(width) , clampTo<float>(height));
64 } 63 }
65 64
66 #if ENABLE(ASSERT) 65 #if ENABLE(ASSERT)
67 bool FloatRect::mayNotHaveExactIntRectRepresentation() const 66 bool FloatRect::mayNotHaveExactIntRectRepresentation() const
68 { 67 {
69 static const float maxExactlyExpressible = 1 << FLT_MANT_DIG; 68 static const float maxExactlyExpressible = 1 << FLT_MANT_DIG;
70 return fabs(x()) > maxExactlyExpressible || fabs(y()) > maxExactlyExpressibl e 69 return fabs(x()) > maxExactlyExpressible || fabs(y()) > maxExactlyExpressibl e
71 || fabs(width()) > maxExactlyExpressible || fabs(height()) > maxExactlyE xpressible 70 || fabs(width()) > maxExactlyExpressible || fabs(height()) > maxExactlyE xpressible
72 || fabs(maxX()) > maxExactlyExpressible || fabs(maxY()) > maxExactlyExpr essible; 71 || fabs(maxX()) > maxExactlyExpressible || fabs(maxY()) > maxExactlyExpr essible;
73 } 72 }
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } 232 }
234 233
235 String FloatRect::toString() const 234 String FloatRect::toString() const
236 { 235 {
237 return String::format("%s %s", 236 return String::format("%s %s",
238 location().toString().ascii().data(), 237 location().toString().ascii().data(),
239 size().toString().ascii().data()); 238 size().toString().ascii().data());
240 } 239 }
241 240
242 } // namespace blink 241 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/geometry/FloatPoint.cpp ('k') | third_party/WebKit/Source/platform/geometry/FloatSize.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698