From bbf70f5abb76bcad6bdf9bae26e631e76c1c5439 Mon Sep 17 00:00:00 2001
From: Teng-Hui Zhu <ztenghui@google.com>
Date: Wed, 22 Feb 2012 16:55:13 -0800
Subject: Fix issues when DEBUG turned on

Change-Id: Ifeeed93859f3b9122cf6e2aa3ae66d6cfa603dce
---
 Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 2 +-
 Source/WebCore/platform/graphics/android/ShaderProgram.cpp  | 9 ++++++---
 Source/WebCore/platform/graphics/android/TiledPage.cpp      | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'Source')

diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index e0d48ee..76d7324 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -141,7 +141,7 @@ bool GLWebViewState::setBaseLayer(BaseLayerAndroid* layer, bool showVisualIndica
         m_layersRenderingMode = kAllTextures;
     }
     if (layer) {
-        XLOG("new base layer %p, (inval region empty %d) with child %p", layer, inval.isEmpty(), layer->getChild(0));
+        XLOG("new base layer %p, with child %p", layer, layer->getChild(0));
         layer->setState(this);
     }
     bool queueFull = m_treeManager.updateWithTree(layer, isPictureAfterFirstLayout);
diff --git a/Source/WebCore/platform/graphics/android/ShaderProgram.cpp b/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
index 59c1271..4925bd6 100644
--- a/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
+++ b/Source/WebCore/platform/graphics/android/ShaderProgram.cpp
@@ -38,6 +38,9 @@
 #include <wtf/CurrentTime.h>
 #include <wtf/text/CString.h>
 
+#undef XLOGC
+#define XLOGC(...) android_printLog(ANDROID_LOG_DEBUG, "ShaderProgram", __VA_ARGS__)
+
 #ifdef DEBUG
 
 #undef XLOG
@@ -45,10 +48,10 @@
 
 #else
 
-#undef XLOGC
-#define XLOGC(...) android_printLog(ANDROID_LOG_DEBUG, "ShaderProgram", __VA_ARGS__)
+#undef XLOG
+#define XLOG(...)
 
-#endif
+#endif // DEBUG
 
 namespace WebCore {
 
diff --git a/Source/WebCore/platform/graphics/android/TiledPage.cpp b/Source/WebCore/platform/graphics/android/TiledPage.cpp
index 8c43fc4..7aac242 100644
--- a/Source/WebCore/platform/graphics/android/TiledPage.cpp
+++ b/Source/WebCore/platform/graphics/android/TiledPage.cpp
@@ -353,7 +353,7 @@ bool TiledPage::swapBuffersIfReady(const SkIRect& tileBounds, float scale)
             swaps++;
     }
 
-    XLOG("%p greedy swapped %d textures, returning true", this, swaps);
+    XLOG("%p greedy swapped %d textures, returning %d", this, swaps, fullSwap);
     return fullSwap;
 }
 
-- 
cgit v1.1