diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-25 15:42:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-25 15:42:37 -0700 |
| commit | 38ea37b8e24510a49a3eded4a6f4863584479fec (patch) | |
| tree | 64ab58209a71dc297256507dc18d30277e463a5d /Source/WebCore/platform/graphics/android | |
| parent | 2cb64bfb5132a7e48f6f425eccaf1db079b91ced (diff) | |
| parent | 41a420aa58df2d7ae8c7f491e7ec4c3edc8a1ecb (diff) | |
| download | external_webkit-38ea37b8e24510a49a3eded4a6f4863584479fec.zip external_webkit-38ea37b8e24510a49a3eded4a6f4863584479fec.tar.gz external_webkit-38ea37b8e24510a49a3eded4a6f4863584479fec.tar.bz2 | |
Merge "Use newest available SurfaceBacking scale when counting texture usage" into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android')
| -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 |