diff options
| author | Chris Craik <ccraik@google.com> | 2011-10-24 18:51:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-24 18:51:53 -0700 |
| commit | 6291161a03835d77f289308987abfd126cc1e16e (patch) | |
| tree | 1f94ffa835a549bc752d59c84837ff36f1ad2de2 /Source/WebCore/platform/graphics/android | |
| parent | 2c6a03a116ab0fafc5e33c70854da3694705824e (diff) | |
| parent | 0d4258e78caa860491a4c9e6965e574dabc3ec63 (diff) | |
| download | external_webkit-6291161a03835d77f289308987abfd126cc1e16e.zip external_webkit-6291161a03835d77f289308987abfd126cc1e16e.tar.gz external_webkit-6291161a03835d77f289308987abfd126cc1e16e.tar.bz2 | |
am 0d4258e7: Merge "Take scale into account when greedily prefetching an entire layer" into ics-mr0
* commit '0d4258e78caa860491a4c9e6965e574dabc3ec63':
Take scale into account when greedily prefetching an entire layer
Diffstat (limited to 'Source/WebCore/platform/graphics/android')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/PaintedSurface.cpp | 4 |
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 2b24e9e..c0597a9 100644 --- a/Source/WebCore/platform/graphics/android/PaintedSurface.cpp +++ b/Source/WebCore/platform/graphics/android/PaintedSurface.cpp @@ -201,8 +201,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; } |