diff options
author | Chris Craik <ccraik@google.com> | 2012-04-09 14:10:08 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-09 14:10:08 -0700 |
commit | 98e8504d9f510b8cbaca1b0144efea3a4d1a8eec (patch) | |
tree | 707a6a18b20714d6b2c3be020a4b585b0c0b6168 /Source/WebCore | |
parent | 76088175b1505b9730f9a01f4c677641cef72e3a (diff) | |
parent | ca1e910446353672503d5251c28cc7384018932a (diff) | |
download | external_webkit-98e8504d9f510b8cbaca1b0144efea3a4d1a8eec.zip external_webkit-98e8504d9f510b8cbaca1b0144efea3a4d1a8eec.tar.gz external_webkit-98e8504d9f510b8cbaca1b0144efea3a4d1a8eec.tar.bz2 |
Merge "disable expanded bounds when highEndGfx=false"
Diffstat (limited to 'Source/WebCore')
-rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp b/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp index 0e900a9..5ce63bf 100644 --- a/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp @@ -192,10 +192,13 @@ void TileGrid::prepareGL(GLWebViewState* state, float scale, if (useExpandPrefetch) { IntRect fullArea = computeTilesArea(unclippedArea, scale); IntRect expandedArea = m_area; - expandedArea.inflate(EXPANDED_BOUNDS_INFLATE); + + // on systems reporting highEndGfx=true, use expanded high res bounds + if (TilesManager::instance()->highEndGfx()) + expandedArea.inflate(EXPANDED_BOUNDS_INFLATE); if (isLowResPrefetch) - expandedArea.inflate(EXPANDED_PREFETCH_BOUNDS_Y_INFLATE); + expandedArea.inflateY(EXPANDED_PREFETCH_BOUNDS_Y_INFLATE); // clip painting area to content expandedArea.intersect(fullArea); |