diff options
| author | Chris Craik <ccraik@google.com> | 2011-08-23 10:02:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-23 10:02:28 -0700 |
| commit | 2611ed55f09dc1c2b17df5e453256c15722b5846 (patch) | |
| tree | 4de92e0f1a3ebcd858866015886162a338058103 /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | 377f79007646131d8b91f685c89cb49abec5a996 (diff) | |
| parent | 4a59c354560ed255d45ad00dbdbed13f045c557e (diff) | |
| download | external_webkit-2611ed55f09dc1c2b17df5e453256c15722b5846.zip external_webkit-2611ed55f09dc1c2b17df5e453256c15722b5846.tar.gz external_webkit-2611ed55f09dc1c2b17df5e453256c15722b5846.tar.bz2 | |
Merge "Re-enable tile prefetching, correct and adjust max tile allocation logic"
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index aa4fcd2..3cc192f 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -395,8 +395,8 @@ void GLWebViewState::setViewport(SkRect& viewport, float scale) static_cast<int>(ceilf(viewport.fRight * invTileContentWidth)), static_cast<int>(ceilf(viewport.fBottom * invTileContentHeight))); - int maxTextureCount = (m_viewportTileBounds.width() + TILE_PREFETCH_DISTANCE * 2 + 1) * - (m_viewportTileBounds.height() + TILE_PREFETCH_DISTANCE * 2 + 1) * 2; + int maxTextureCount = (m_viewportTileBounds.width() + TILE_PREFETCH_DISTANCE * 2) * + (m_viewportTileBounds.height() + TILE_PREFETCH_DISTANCE * 2) * 2; TilesManager::instance()->setMaxTextureCount(maxTextureCount); m_tiledPageA->updateBaseTileSize(); m_tiledPageB->updateBaseTileSize(); |