summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/rendering/SurfaceBacking.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-05-25 15:02:45 -0700
committerChris Craik <ccraik@google.com>2012-05-25 15:02:45 -0700
commit41a420aa58df2d7ae8c7f491e7ec4c3edc8a1ecb (patch)
tree435c6cd4b0d6330fadfed5e01297d4648f205ec5 /Source/WebCore/platform/graphics/android/rendering/SurfaceBacking.cpp
parent385ef015bf9d84a940d65586b9f70292f6b6fb63 (diff)
downloadexternal_webkit-41a420aa58df2d7ae8c7f491e7ec4c3edc8a1ecb.zip
external_webkit-41a420aa58df2d7ae8c7f491e7ec4c3edc8a1ecb.tar.gz
external_webkit-41a420aa58df2d7ae8c7f491e7ec4c3edc8a1ecb.tar.bz2
Use newest available SurfaceBacking scale when counting texture usage
Using m_scale would mean that while zooming out, the clipped area would get larger, but the scale would stay the same. bug:6561401 Change-Id: I0806ecb8f565c4d227a2be2b7a27a0af6aff7b46
Diffstat (limited to 'Source/WebCore/platform/graphics/android/rendering/SurfaceBacking.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/SurfaceBacking.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceBacking.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceBacking.cpp
index 6d26aa8..d7f6535 100644
--- a/Source/WebCore/platform/graphics/android/rendering/SurfaceBacking.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceBacking.cpp
@@ -171,8 +171,8 @@ void SurfaceBacking::computeTexturesAmount(TexturesResult* result,
// - textures needed for a clipped area
// - textures needed for an un-clipped area
TileGrid* tileGrid = m_zooming ? m_backTileGrid : m_frontTileGrid;
- int nbTexturesUnclipped = tileGrid->nbTextures(fullContentArea, m_scale);
- int nbTexturesClipped = tileGrid->nbTextures(visibleContentArea, m_scale);
+ int nbTexturesUnclipped = tileGrid->nbTextures(fullContentArea, m_futureScale);
+ int nbTexturesClipped = tileGrid->nbTextures(visibleContentArea, m_futureScale);
if (layer) {
// TODO: should handle multi-layer case better