summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-06-21 15:37:20 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2011-06-21 15:54:11 -0700
commitd311450d853b38d1c3c3bcd2cf0955080c059f30 (patch)
treec610bfee5c55b16f48ba0e28909caa7366cad4d2
parent5c1199e7a7ad05f8f26e595ddb355dabe7f93e88 (diff)
downloadexternal_webkit-d311450d853b38d1c3c3bcd2cf0955080c059f30.zip
external_webkit-d311450d853b38d1c3c3bcd2cf0955080c059f30.tar.gz
external_webkit-d311450d853b38d1c3c3bcd2cf0955080c059f30.tar.bz2
Fix compiler error when DEBUG is turned on
Change-Id: I1a9d8eab3e5259eade94fc9e825ec4d162a1e392
-rw-r--r--Source/WebCore/platform/graphics/android/BaseTile.cpp2
-rw-r--r--Source/WebKit/android/jni/PictureSet.cpp2
2 files changed, 2 insertions, 2 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);
}
diff --git a/Source/WebKit/android/jni/PictureSet.cpp b/Source/WebKit/android/jni/PictureSet.cpp
index 98d7438..d05f315 100644
--- a/Source/WebKit/android/jni/PictureSet.cpp
+++ b/Source/WebKit/android/jni/PictureSet.cpp
@@ -221,7 +221,7 @@ void PictureSet::add(const SkRegion& area, SkPicture* picture,
if (!clearUp) {
if (mBaseArea > 0 && mBaseArea * MAX_ADDITIONAL_AREA <= mAdditionalArea) {
XLOG("+++ the sum of the additional area is > %.2f\% of the base Area (%.2f (%.2f) <= %.2f",
- MAX_ADDITIONAL_AREA * 100, baseArea * 0.65, baseArea, addArea);
+ MAX_ADDITIONAL_AREA * 100, mBaseArea * 0.65, mBaseArea, mAdditionalArea);
clearUp = true;
}
}