summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-06-22 09:37:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-22 09:37:17 -0700
commit4b97cf9c52f5ec2971f86b60f757f3d6d37c59ab (patch)
tree9f0d33626e100f8a37c6c95ca5afa80b7478df94 /Source/WebCore
parent0aeb39e78cd408ab6a60c25bc5dd25c4894cd262 (diff)
parentd311450d853b38d1c3c3bcd2cf0955080c059f30 (diff)
downloadexternal_webkit-4b97cf9c52f5ec2971f86b60f757f3d6d37c59ab.zip
external_webkit-4b97cf9c52f5ec2971f86b60f757f3d6d37c59ab.tar.gz
external_webkit-4b97cf9c52f5ec2971f86b60f757f3d6d37c59ab.tar.bz2
Merge "Fix compiler error when DEBUG is turned on"
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/platform/graphics/android/BaseTile.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseTile.cpp b/Source/WebCore/platform/graphics/android/BaseTile.cpp
index 35ebf13..bbf1532 100644
--- a/Source/WebCore/platform/graphics/android/BaseTile.cpp
+++ b/Source/WebCore/platform/graphics/android/BaseTile.cpp
@@ -236,7 +236,7 @@ void BaseTile::draw(float transparency, SkRect& rect, float scale)
}
if (m_texture->readyFor(this)) {
- XLOG("draw tile %d, %d, %.2f with texture %x", x(), y(), scale(), m_texture);
+ XLOG("draw tile %d, %d, %.2f with texture %x", x(), y(), scale, m_texture);
TilesManager::instance()->shader()->drawQuad(rect, textureInfo->m_textureId,
transparency);
}