summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2011-10-24 18:50:07 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-24 18:50:07 -0700
commit0d4258e78caa860491a4c9e6965e574dabc3ec63 (patch)
treec0af2a01e082660b5e4e317b6e7457c230060893 /Source/WebCore/platform/graphics/android
parentbee2599ec82af8aaf47491b6aea4ee07a377c81a (diff)
parent4d0ea4e3b154e29321df8e6d8c76a1535dbb1a73 (diff)
downloadexternal_webkit-0d4258e78caa860491a4c9e6965e574dabc3ec63.zip
external_webkit-0d4258e78caa860491a4c9e6965e574dabc3ec63.tar.gz
external_webkit-0d4258e78caa860491a4c9e6965e574dabc3ec63.tar.bz2
Merge "Take scale into account when greedily prefetching an entire layer" into ics-mr0
Diffstat (limited to 'Source/WebCore/platform/graphics/android')
-rw-r--r--Source/WebCore/platform/graphics/android/PaintedSurface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/PaintedSurface.cpp b/Source/WebCore/platform/graphics/android/PaintedSurface.cpp
index 00129a0..8f78638 100644
--- a/Source/WebCore/platform/graphics/android/PaintedSurface.cpp
+++ b/Source/WebCore/platform/graphics/android/PaintedSurface.cpp
@@ -214,8 +214,8 @@ void PaintedSurface::computeVisibleArea() {
if (!m_visibleArea.isEmpty()) {
float tileWidth = TilesManager::instance()->layerTileWidth();
float tileHeight = TilesManager::instance()->layerTileHeight();
- int w = ceilf(m_area.width() / tileWidth);
- int h = ceilf(m_area.height() / tileHeight);
+ int w = ceilf(m_area.width() * m_scale / tileWidth);
+ int h = ceilf(m_area.height() * m_scale / tileHeight);
if (w * h < MAX_UNCLIPPED_AREA)
m_visibleArea = m_area;
}