diff options
| author | Chris Craik <ccraik@google.com> | 2012-04-12 09:46:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 09:46:36 -0700 |
| commit | 615ac999e6dcab2b8ea3acd117c3ef6914e0e71b (patch) | |
| tree | 5d7e4a563224634ed94ea3c6d07d2dae48c70221 /Source/WebCore/platform/graphics/android | |
| parent | c5dcbf89c81ccb7d1de3038952bddf06ce821277 (diff) | |
| parent | 72ae6b87e6a35b6bea03035afa3fe21284033444 (diff) | |
| download | external_webkit-615ac999e6dcab2b8ea3acd117c3ef6914e0e71b.zip external_webkit-615ac999e6dcab2b8ea3acd117c3ef6914e0e71b.tar.gz external_webkit-615ac999e6dcab2b8ea3acd117c3ef6914e0e71b.tar.bz2 | |
Merge "Log tiles correctly for the base surface"
Diffstat (limited to 'Source/WebCore/platform/graphics/android')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp b/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp index 2510d52..a58a1d2 100644 --- a/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/TileGrid.cpp @@ -274,8 +274,8 @@ int TileGrid::nbTextures(IntRect& area, float scale) } void TileGrid::drawGL(const IntRect& visibleArea, float opacity, - const TransformationMatrix* transform, - const Color* background) + const TransformationMatrix* transform, + const Color* background) { m_area = computeTilesArea(visibleArea, m_scale); if (m_area.width() == 0 || m_area.height() == 0) @@ -322,7 +322,8 @@ void TileGrid::drawGL(const IntRect& visibleArea, float opacity, drawn++; } - if (semiOpaqueBaseSurface) + // log tile information for base, high res tiles + if (m_isBaseSurface && background) TilesManager::instance()->getProfiler()->nextTile(tile, invScale, tileInView); } |