diff options
author | Shimeng (Simon) Wang <swang@google.com> | 2010-12-07 17:22:45 -0800 |
---|---|---|
committer | Shimeng (Simon) Wang <swang@google.com> | 2010-12-22 14:15:40 -0800 |
commit | 4576aa36e9a9671459299c7963ac95aa94beaea9 (patch) | |
tree | 3863574e050f168c0126ecb47c83319fab0972d8 /WebCore/rendering/RenderObject.h | |
parent | 55323ac613cc31553107b68603cb627264d22bb0 (diff) | |
download | external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.zip external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.gz external_webkit-4576aa36e9a9671459299c7963ac95aa94beaea9.tar.bz2 |
Merge WebKit at r73109: Initial merge by git.
Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
Diffstat (limited to 'WebCore/rendering/RenderObject.h')
-rw-r--r-- | WebCore/rendering/RenderObject.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/WebCore/rendering/RenderObject.h b/WebCore/rendering/RenderObject.h index bfc62fe..e16ad46 100644 --- a/WebCore/rendering/RenderObject.h +++ b/WebCore/rendering/RenderObject.h @@ -1002,14 +1002,6 @@ inline int adjustForAbsoluteZoom(int value, RenderObject* renderer) return adjustForAbsoluteZoom(value, renderer->style()); } -inline void adjustIntRectForAbsoluteZoom(IntRect& rect, RenderObject* renderer) -{ - rect.setX(adjustForAbsoluteZoom(rect.x(), renderer)); - rect.setY(adjustForAbsoluteZoom(rect.y(), renderer)); - rect.setWidth(adjustForAbsoluteZoom(rect.width(), renderer)); - rect.setHeight(adjustForAbsoluteZoom(rect.height(), renderer)); -} - inline FloatPoint adjustFloatPointForAbsoluteZoom(const FloatPoint& point, RenderObject* renderer) { // The result here is in floats, so we don't need the truncation hack from the integer version above. @@ -1027,6 +1019,15 @@ inline void adjustFloatQuadForAbsoluteZoom(FloatQuad& quad, RenderObject* render quad.setP4(adjustFloatPointForAbsoluteZoom(quad.p4(), renderer)); } +inline void adjustFloatRectForAbsoluteZoom(FloatRect& rect, RenderObject* renderer) +{ + RenderStyle* style = renderer->style(); + rect.setX(adjustFloatForAbsoluteZoom(rect.x(), style)); + rect.setY(adjustFloatForAbsoluteZoom(rect.y(), style)); + rect.setWidth(adjustFloatForAbsoluteZoom(rect.width(), style)); + rect.setHeight(adjustFloatForAbsoluteZoom(rect.height(), style)); +} + } // namespace WebCore #ifndef NDEBUG |