From 4576aa36e9a9671459299c7963ac95aa94beaea9 Mon Sep 17 00:00:00 2001
From: "Shimeng (Simon) Wang" <swang@google.com>
Date: Tue, 7 Dec 2010 17:22:45 -0800
Subject: Merge WebKit at r73109: Initial merge by git.

Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
---
 WebCore/rendering/style/RenderStyle.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'WebCore/rendering/style')

diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index c206acd..ad66660 100644
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -1382,6 +1382,11 @@ inline int adjustForAbsoluteZoom(int value, const RenderStyle* style)
     return roundForImpreciseConversion<int, INT_MAX, INT_MIN>(value / zoomFactor);
 }
 
+inline float adjustFloatForAbsoluteZoom(float value, const RenderStyle* style)
+{
+    return value / style->effectiveZoom();
+}
+
 } // namespace WebCore
 
 #endif // RenderStyle_h
-- 
cgit v1.1