diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-06-22 09:37:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-22 09:37:17 -0700 |
| commit | 4b97cf9c52f5ec2971f86b60f757f3d6d37c59ab (patch) | |
| tree | 9f0d33626e100f8a37c6c95ca5afa80b7478df94 | |
| parent | 0aeb39e78cd408ab6a60c25bc5dd25c4894cd262 (diff) | |
| parent | d311450d853b38d1c3c3bcd2cf0955080c059f30 (diff) | |
| download | external_webkit-4b97cf9c52f5ec2971f86b60f757f3d6d37c59ab.zip external_webkit-4b97cf9c52f5ec2971f86b60f757f3d6d37c59ab.tar.gz external_webkit-4b97cf9c52f5ec2971f86b60f757f3d6d37c59ab.tar.bz2 | |
Merge "Fix compiler error when DEBUG is turned on"
| -rw-r--r-- | Source/WebCore/platform/graphics/android/BaseTile.cpp | 2 | ||||
| -rw-r--r-- | Source/WebKit/android/jni/PictureSet.cpp | 2 |
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; } } |