diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-25 15:49:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-25 15:49:08 -0700 |
| commit | 9fd07026d692d3f64f718cd98200e93119009749 (patch) | |
| tree | 8c86d134f55c4e2620594977daaa1ab38ab31945 /Source/WebCore/platform | |
| parent | 3ff09c117918ab8e0044c0d2500cf9a7ab74a390 (diff) | |
| parent | 70752fcef6c92ef66935d98373441aed985fafe2 (diff) | |
| download | external_webkit-9fd07026d692d3f64f718cd98200e93119009749.zip external_webkit-9fd07026d692d3f64f718cd98200e93119009749.tar.gz external_webkit-9fd07026d692d3f64f718cd98200e93119009749.tar.bz2 | |
am 70752fce: am 38ea37b8: Merge "Use newest available SurfaceBacking scale when counting texture usage" into jb-dev
* commit '70752fcef6c92ef66935d98373441aed985fafe2':
Use newest available SurfaceBacking scale when counting texture usage
Diffstat (limited to 'Source/WebCore/platform')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/SurfaceBacking.cpp | 4 |
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 |