diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-12-06 14:54:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-06 14:54:00 -0800 |
| commit | 1243f431c72be22bf319cfe362a1df3c0c0f3159 (patch) | |
| tree | 40b1372ed8249c83f0b02aeb3f60733a6c339896 /Source/WebCore | |
| parent | 10d8830f30f9475f146b2d5514b13e44613d43dc (diff) | |
| parent | c7082419f38f3426a67d6ba7b7971256e3c4fc7e (diff) | |
| download | external_webkit-1243f431c72be22bf319cfe362a1df3c0c0f3159.zip external_webkit-1243f431c72be22bf319cfe362a1df3c0c0f3159.tar.gz external_webkit-1243f431c72be22bf319cfe362a1df3c0c0f3159.tar.bz2 | |
Merge "compiler error fix when DEBUG is on"
Diffstat (limited to 'Source/WebCore')
3 files changed, 4 insertions, 5 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index b4a619b..8cb4938 100644 --- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -289,8 +289,8 @@ bool BaseLayerAndroid::prepareBasePictureInGL(SkRect& viewport, float scale, tiledPage->prepare(goingDown, goingLeft, preZoomBounds, TiledPage::ExpandedBounds); - XLOG("scrolling %d, zooming %d, needsRedraw %d", - scrolling, zooming, needsRedraw); + XLOG("scrollState %d, zooming %d, needsRedraw %d", + m_scrollState, zooming, needsRedraw); // prefetch in the nextTiledPage if unused by zooming (even if not scrolling // since we want the tiles to be ready before they're needed) diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index f2c3b2b..0aa876f 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -579,7 +579,6 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect, #ifdef DEBUG TilesManager::instance()->getTilesTracker()->showTrackTextures(); - ImagesManager::instance()->showImages(); #endif return ret; diff --git a/Source/WebCore/platform/graphics/android/TilesManager.cpp b/Source/WebCore/platform/graphics/android/TilesManager.cpp index 30bd8d0..41ebfef 100644 --- a/Source/WebCore/platform/graphics/android/TilesManager.cpp +++ b/Source/WebCore/platform/graphics/android/TilesManager.cpp @@ -185,8 +185,8 @@ void TilesManager::deallocateTexturesVector(unsigned long long sparedDrawCount, dealloc++; } } - XLOG("Deallocated %d gl textures (out of %d base tiles and %d layer tiles)", - dealloc, max, maxLayer); + XLOG("Deallocated %d gl textures (out of %d %s tiles)", + dealloc, max, (textures == m_textures) ? "base" : "layer"); } void TilesManager::gatherTexturesNumbers(int* nbTextures, int* nbAllocatedTextures, |