summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-06-06 18:05:11 +0100
committerBen Murdoch <benm@google.com>2011-06-10 14:57:12 +0100
commita075119a3ff38eaee9cadc740c8180da2d2e0657 (patch)
tree0a182a1708ccef0e1d0d423b5be811041d065426 /Source/WebCore
parent839c3f480504bf44536a37733a402a82a3fed7fd (diff)
downloadexternal_webkit-a075119a3ff38eaee9cadc740c8180da2d2e0657.zip
external_webkit-a075119a3ff38eaee9cadc740c8180da2d2e0657.tar.gz
external_webkit-a075119a3ff38eaee9cadc740c8180da2d2e0657.tar.bz2
Merge WebKit at r84325: Fix GraphicsContextAndroid.cpp
GraphicsContext::roundToDevicePixels has a new parameter. See http://trac.webkit.org/changeset/83216 Change-Id: I9f215b450c790ac1e6a54959e5cbee43d3a25694
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index 3e20a75..43275a7 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -1144,7 +1144,7 @@ void GraphicsContext::concatCTM(const AffineTransform& affine)
// If we instead draw into bitmap tiles, we should then perform this
// transform -> round -> inverse step.
-FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& rect)
+FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& rect, RoundingMode)
{
return rect;
}