projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
WebKit
/
Source
/
platform
/
LayoutUnit.h
diff --git
a/src/third_party/WebKit/Source/platform/LayoutUnit.h
b/src/third_party/WebKit/Source/platform/LayoutUnit.h
index
e0c7a39
..
5606ef2
100644
(file)
--- a/
src/third_party/WebKit/Source/platform/LayoutUnit.h
+++ b/
src/third_party/WebKit/Source/platform/LayoutUnit.h
@@
-54,7
+54,8
@@
while (0)
#endif
#endif
-static const int kFixedPointDenominator = 64;
+static const int kLayoutUnitFractionalBits = 6;
+static const int kFixedPointDenominator = 1 << kLayoutUnitFractionalBits;
const int intMaxForLayoutUnit = INT_MAX / kFixedPointDenominator;
const int intMinForLayoutUnit = INT_MIN / kFixedPointDenominator;
const int intMaxForLayoutUnit = INT_MAX / kFixedPointDenominator;
const int intMinForLayoutUnit = INT_MIN / kFixedPointDenominator;
@@
-145,9
+146,7
@@
public:
}
int round() const
{
}
int round() const
{
- if (m_value > 0)
- return saturatedAddition(rawValue(), kFixedPointDenominator / 2) / kFixedPointDenominator;
- return saturatedSubtraction(rawValue(), (kFixedPointDenominator / 2) - 1) / kFixedPointDenominator;
+ return saturatedAddition(rawValue(), kFixedPointDenominator / 2) >> kLayoutUnitFractionalBits;
}
int floor() const
}
int floor() const
@@
-155,9
+154,7
@@
public:
if (UNLIKELY(m_value <= INT_MIN + kFixedPointDenominator - 1))
return intMinForLayoutUnit;
if (UNLIKELY(m_value <= INT_MIN + kFixedPointDenominator - 1))
return intMinForLayoutUnit;
- if (m_value >= 0)
- return toInt();
- return (m_value - kFixedPointDenominator + 1) / kFixedPointDenominator;
+ return m_value >> kLayoutUnitFractionalBits;
}
LayoutUnit fraction() const
}
LayoutUnit fraction() const