summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android
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/WebKit/android
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/WebKit/android')
-rw-r--r--Source/WebKit/android/jni/PictureSet.cpp2
1 files changed, 1 insertions, 1 deletions
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;
}
}