diff options
| author | John Reck <jreck@google.com> | 2011-11-21 21:07:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 21:07:35 -0800 |
| commit | be5a48f03761c980b096111d62e9ca03624e8364 (patch) | |
| tree | 14aacc0c566f83ccf7160ec3df617e07d1b945fd /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | 96309385b22eca3b1ff3eb9d30bea0958ce47875 (diff) | |
| parent | bd996ca3728f985d3fee81471268643ca772ed40 (diff) | |
| download | external_webkit-be5a48f03761c980b096111d62e9ca03624e8364.zip external_webkit-be5a48f03761c980b096111d62e9ca03624e8364.tar.gz external_webkit-be5a48f03761c980b096111d62e9ca03624e8364.tar.bz2 | |
am bd996ca3: Merge "Use isHighEndGfx to double textures" into ics-mr1
* commit 'bd996ca3728f985d3fee81471268643ca772ed40':
Use isHighEndGfx to double textures
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 6e2d3b7..77bc208 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -86,6 +86,7 @@ GLWebViewState::GLWebViewState() , m_expandedTileBoundsY(0) , m_scale(1) , m_layersRenderingMode(kAllTextures) + , m_highEndGfx(false) { m_viewport.setEmpty(); m_futureViewportTileBounds.setEmpty(); @@ -262,7 +263,7 @@ void GLWebViewState::setViewport(SkRect& viewport, float scale) int viewMaxTileY = static_cast<int>(ceilf((viewport.height()-1) * invTileContentHeight)) + 1; int maxTextureCount = (viewMaxTileX + m_expandedTileBoundsX * 2) * - (viewMaxTileY + m_expandedTileBoundsY * 2) * 2; + (viewMaxTileY + m_expandedTileBoundsY * 2) * (m_highEndGfx ? 4 : 2); TilesManager::instance()->setMaxTextureCount(maxTextureCount); m_tiledPageA->updateBaseTileSize(); |