OLD | NEW |
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 |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "platform/FloatConversion.h" | 30 #include "platform/FloatConversion.h" |
31 #include "platform/geometry/IntSize.h" | 31 #include "platform/geometry/IntSize.h" |
32 #include "platform/geometry/LayoutSize.h" | 32 #include "platform/geometry/LayoutSize.h" |
33 #include <limits> | 33 #include <limits> |
34 #include <math.h> | 34 #include <math.h> |
35 | 35 |
36 using namespace std; | 36 using namespace std; |
37 | 37 |
38 namespace WebCore { | 38 namespace WebCore { |
39 | 39 |
40 FloatSize::FloatSize(const LayoutSize& size) : m_width(size.width()), m_height(s
ize.height()) | 40 FloatSize::FloatSize(const LayoutSize& size) |
| 41 : m_width(size.width().toFloat()) |
| 42 , m_height(size.height().toFloat()) |
41 { | 43 { |
42 } | 44 } |
43 | 45 |
44 float FloatSize::diagonalLength() const | 46 float FloatSize::diagonalLength() const |
45 { | 47 { |
46 return sqrtf(diagonalLengthSquared()); | 48 return sqrtf(diagonalLengthSquared()); |
47 } | 49 } |
48 | 50 |
49 bool FloatSize::isZero() const | 51 bool FloatSize::isZero() const |
50 { | 52 { |
51 return fabs(m_width) < numeric_limits<float>::epsilon() && fabs(m_height) <
numeric_limits<float>::epsilon(); | 53 return fabs(m_width) < numeric_limits<float>::epsilon() && fabs(m_height) <
numeric_limits<float>::epsilon(); |
52 } | 54 } |
53 | 55 |
54 bool FloatSize::isExpressibleAsIntSize() const | 56 bool FloatSize::isExpressibleAsIntSize() const |
55 { | 57 { |
56 return isWithinIntRange(m_width) && isWithinIntRange(m_height); | 58 return isWithinIntRange(m_width) && isWithinIntRange(m_height); |
57 } | 59 } |
58 | 60 |
59 FloatSize FloatSize::narrowPrecision(double width, double height) | 61 FloatSize FloatSize::narrowPrecision(double width, double height) |
60 { | 62 { |
61 return FloatSize(narrowPrecisionToFloat(width), narrowPrecisionToFloat(heigh
t)); | 63 return FloatSize(narrowPrecisionToFloat(width), narrowPrecisionToFloat(heigh
t)); |
62 } | 64 } |
63 | 65 |
64 } | 66 } |
OLD | NEW |