summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-04-09 14:39:00 -0700
committerChris Craik <ccraik@google.com>2012-04-09 15:43:19 -0700
commit77a63f12c44ce6ef9e69cb9a2e104fc625d96cac (patch)
tree539ccffcd559fb318abf241d395727ea22672dee /Source/WebCore/platform/graphics/android/GLWebViewState.cpp
parent98e8504d9f510b8cbaca1b0144efea3a4d1a8eec (diff)
downloadexternal_webkit-77a63f12c44ce6ef9e69cb9a2e104fc625d96cac.zip
external_webkit-77a63f12c44ce6ef9e69cb9a2e104fc625d96cac.tar.gz
external_webkit-77a63f12c44ce6ef9e69cb9a2e104fc625d96cac.tar.bz2
Don't render expanded bounds if useMinimalMemory set
Extracted TilesManager instance locally, and standardized the extraction naming. Change-Id: Ia6ba1013bc6502f7c3a49d5dbf5d74739d997d2e
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/GLWebViewState.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index 99eb1c6..1b0513b 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -132,10 +132,10 @@ void GLWebViewState::setViewport(const SkRect& viewport, float scale)
int viewMaxTileX = static_cast<int>(ceilf((viewport.width()-1) * invTileContentWidth)) + 1;
int viewMaxTileY = static_cast<int>(ceilf((viewport.height()-1) * invTileContentHeight)) + 1;
- TilesManager* manager = TilesManager::instance();
- int maxTextureCount = viewMaxTileX * viewMaxTileY * (manager->highEndGfx() ? 4 : 2);
+ TilesManager* tilesManager = TilesManager::instance();
+ int maxTextureCount = viewMaxTileX * viewMaxTileY * (tilesManager->highEndGfx() ? 4 : 2);
- manager->setMaxTextureCount(maxTextureCount);
+ tilesManager->setMaxTextureCount(maxTextureCount);
// TODO: investigate whether we can move this return earlier.
if ((m_viewport == viewport)