diff options
author | Chris Craik <ccraik@google.com> | 2012-04-09 16:10:34 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-09 16:10:34 -0700 |
commit | a142abc601fb35361c769abfee0bacee79310d3c (patch) | |
tree | bf24a01ed557381e0f4ae6da97480197a4438d25 /Source/WebCore/platform/graphics/android/rendering | |
parent | 55395a33cb848de5b522b7309a337ca7625a2523 (diff) | |
parent | 77a63f12c44ce6ef9e69cb9a2e104fc625d96cac (diff) | |
download | external_webkit-a142abc601fb35361c769abfee0bacee79310d3c.zip external_webkit-a142abc601fb35361c769abfee0bacee79310d3c.tar.gz external_webkit-a142abc601fb35361c769abfee0bacee79310d3c.tar.bz2 |
Merge "Don't render expanded bounds if useMinimalMemory set"
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering')
-rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp b/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp index 5ce63bf..63f73aa 100644 --- a/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp @@ -153,8 +153,9 @@ void TileGrid::prepareGL(GLWebViewState* state, float scale, bool goingDown = m_prevTileY < m_area.y(); m_prevTileY = m_area.y(); + TilesManager* tilesManager = TilesManager::instance(); if (scale != m_scale) - TilesManager::instance()->removeOperationsForFilter(new ScaleFilter(painter, m_scale)); + tilesManager->removeOperationsForFilter(new ScaleFilter(painter, m_scale)); m_scale = scale; @@ -164,11 +165,11 @@ void TileGrid::prepareGL(GLWebViewState* state, float scale, m_tiles[i]->markAsDirty(m_dirtyRegion); // log inval region for the base surface - if (m_isBaseSurface && TilesManager::instance()->getProfiler()->enabled()) { + if (m_isBaseSurface && tilesManager->getProfiler()->enabled()) { SkRegion::Iterator iterator(m_dirtyRegion); while (!iterator.done()) { SkIRect r = iterator.rect(); - TilesManager::instance()->getProfiler()->nextInval(r, scale); + tilesManager->getProfiler()->nextInval(r, scale); iterator.next(); } } @@ -193,8 +194,8 @@ void TileGrid::prepareGL(GLWebViewState* state, float scale, IntRect fullArea = computeTilesArea(unclippedArea, scale); IntRect expandedArea = m_area; - // on systems reporting highEndGfx=true, use expanded high res bounds - if (TilesManager::instance()->highEndGfx()) + // on systems reporting highEndGfx=true and useMinimalMemory not set, use expanded bounds + if (tilesManager->highEndGfx() && !tilesManager->useMinimalMemory()) expandedArea.inflate(EXPANDED_BOUNDS_INFLATE); if (isLowResPrefetch) |