diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-30 16:56:14 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-01 14:02:38 -0700 |
| commit | ce0e4b6b423e45f5a1c2eeedd8a5eff9d24f666e (patch) | |
| tree | cc8cc04efcc693036601cf652300ab5b87822eae /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | 8073fd72433b2e5610bb0b7a1e310b14c1efa121 (diff) | |
| download | external_webkit-ce0e4b6b423e45f5a1c2eeedd8a5eff9d24f666e.zip external_webkit-ce0e4b6b423e45f5a1c2eeedd8a5eff9d24f666e.tar.gz external_webkit-ce0e4b6b423e45f5a1c2eeedd8a5eff9d24f666e.tar.bz2 | |
Fix max texture setup
bug:5698410
Change-Id: Idff9cb52cabd4cc87427f975fee4968e779139bf
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index 7a94eb5..6fea786 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -135,7 +135,7 @@ void GLWebViewState::setViewport(const SkRect& viewport, float scale) TilesManager* tilesManager = TilesManager::instance(); int maxTextureCount = viewMaxTileX * viewMaxTileY * (tilesManager->highEndGfx() ? 4 : 2); - tilesManager->setMaxTextureCount(maxTextureCount); + tilesManager->setCurrentTextureCount(maxTextureCount); // TODO: investigate whether we can move this return earlier. if ((m_viewport == viewport) @@ -227,11 +227,11 @@ bool GLWebViewState::setLayersRenderingMode(TexturesResult& nbTexturesNeeded) bool invalBase = false; if (!nbTexturesNeeded.full) - TilesManager::instance()->setMaxLayerTextureCount(0); + TilesManager::instance()->setCurrentLayerTextureCount(0); else - TilesManager::instance()->setMaxLayerTextureCount((2*nbTexturesNeeded.full)+1); + TilesManager::instance()->setCurrentLayerTextureCount((2 * nbTexturesNeeded.full) + 1); - int maxTextures = TilesManager::instance()->maxLayerTextureCount(); + int maxTextures = TilesManager::instance()->currentLayerTextureCount(); LayersRenderingMode layersRenderingMode = m_layersRenderingMode; if (m_layersRenderingMode == kSingleSurfaceRendering) { |