compiler error fix when DEBUG is on

Change-Id: I6fbaa9dfe50752fa5ec95cd43ed50306b63270f3

4 files changed, 6 insertions, 7 deletions

diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index 2a1b1de..a7fe030 100644
--- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@ -131,7 +131,7 @@ void BaseLayerAndroid::prefetchBasePicture(SkRect& viewport, float currentScale,
          viewport.fTop,
          viewport.fRight,
          viewport.fBottom,
-         scale);
+         currentScale);
 
     bounds.fLeft = static_cast<int>(floorf(viewport.fLeft * invTileWidth)) - PREFETCH_X_DIST;
     bounds.fTop = static_cast<int>(floorf(viewport.fTop * invTileHeight)) - PREFETCH_Y_DIST;
@@ -141,7 +141,7 @@ void BaseLayerAndroid::prefetchBasePicture(SkRect& viewport, float currentScale,
     XLOG("prefetch rect %d %d %d %d, scale %f, preparing page %p",
          bounds.fLeft, bounds.fTop,
          bounds.fRight, bounds.fBottom,
-         scale * PREFETCH_SCALE,
+         prefetchScale,
          prefetchTiledPage);
 
     prefetchTiledPage->setScale(prefetchScale);
diff --git a/Source/WebCore/platform/graphics/android/MediaTexture.cpp b/Source/WebCore/platform/graphics/android/MediaTexture.cpp
index 1676186..f3d1756 100644
--- a/Source/WebCore/platform/graphics/android/MediaTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/MediaTexture.cpp
@@ -283,7 +283,6 @@ void MediaTexture::setDimensions(const ANativeWindow* window,
 void MediaTexture::setFramerateCallback(const ANativeWindow* window,
                                         FramerateCallbackProc callback)
 {
-    XLOG("Release ANW %p (%p):(%p)", this, m_surfaceTexture.get(), m_surfaceTextureClient.get());
     android::Mutex::Autolock lock(m_mediaLock);
     for (unsigned int i = 0; i < m_videoTextures.size(); i++) {
         if (m_videoTextures[i]->nativeWindow.get() == window) {
diff --git a/Source/WebCore/platform/graphics/android/TiledTexture.cpp b/Source/WebCore/platform/graphics/android/TiledTexture.cpp
index b252303..30aa022 100644
--- a/Source/WebCore/platform/graphics/android/TiledTexture.cpp
+++ b/Source/WebCore/platform/graphics/android/TiledTexture.cpp
@@ -140,7 +140,7 @@ void TiledTexture::prepare(GLWebViewState* state, float scale, bool repaint,
     if (tilesAllReady) {
         m_updateManager.swap();
         m_dirtyRegion.op(m_updateManager.getPaintingInval(), SkRegion::kUnion_Op);
-        XLOG("TT %p swapping, now painting with picture %p"
+        XLOG("TT %p swapping, now painting with picture %p",
              this, m_updateManager.getPaintingPicture());
         m_updateManager.clearPaintingInval();
     }
diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp
index 5c4f0f3..dd72f0d 100644
--- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp
+++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp
@@ -518,7 +518,7 @@ void TransferQueue::saveGLState()
     glGetIntegerv(GL_VIEWPORT, m_GLStateBeforeBlit.viewport);
     glGetBooleanv(GL_SCISSOR_TEST, m_GLStateBeforeBlit.scissor);
     glGetBooleanv(GL_DEPTH_TEST, m_GLStateBeforeBlit.depth);
-#if DEBUG
+#ifdef DEBUG
     glGetFloatv(GL_COLOR_CLEAR_VALUE, m_GLStateBeforeBlit.clearColor);
 #endif
 }
@@ -530,7 +530,7 @@ void TransferQueue::setGLStateForCopy(int width, int height)
     glDisable(GL_SCISSOR_TEST);
     glDisable(GL_DEPTH_TEST);
     // Clear the content is only for debug purpose.
-#if DEBUG
+#ifdef DEBUG
     glClearColor(0, 0, 0, 0);
     glClear(GL_COLOR_BUFFER_BIT);
 #endif
@@ -548,7 +548,7 @@ void TransferQueue::restoreGLState()
 
     if (m_GLStateBeforeBlit.depth[0])
         glEnable(GL_DEPTH_TEST);
-#if DEBUG
+#ifdef DEBUG
     glClearColor(m_GLStateBeforeBlit.clearColor[0],
                  m_GLStateBeforeBlit.clearColor[1],
                  m_GLStateBeforeBlit.clearColor[2],