summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-10-16 14:40:03 -0700
committerChris Craik <ccraik@google.com>2012-10-16 14:40:03 -0700
commit285c0572401578498b0ccb0c3da0828544f2d085 (patch)
tree11432bbb616ffdc6a99fd1595a495dd7ed65f37c /Source/WebKit
parent8ff03fa0f7c92946342312e651aaf8a35f8f3b3c (diff)
downloadexternal_webkit-285c0572401578498b0ccb0c3da0828544f2d085.zip
external_webkit-285c0572401578498b0ccb0c3da0828544f2d085.tar.gz
external_webkit-285c0572401578498b0ccb0c3da0828544f2d085.tar.bz2
Add src rect ptr null check
bug:7339156 Also fix compilation issue for USE_RECORDING_CONTEXT = false, a flag used in debugging. Change-Id: I63924c7551c82a10b0c67cbb44b9b8961551decd
Diffstat (limited to 'Source/WebKit')
-rw-r--r--Source/WebKit/android/jni/PicturePile.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/PicturePile.cpp b/Source/WebKit/android/jni/PicturePile.cpp
index 174980a..44cfccb 100644
--- a/Source/WebKit/android/jni/PicturePile.cpp
+++ b/Source/WebKit/android/jni/PicturePile.cpp
@@ -365,7 +365,7 @@ Picture* PicturePile::recordPicture(PicturePainter* painter, PictureContainer& p
painter->paintContents(&gc, drawArea);
// TODO: consider paint-time checking for these with SkPicture painting?
- pc.maxZoomScale = FLOAT_MAX;
+ pc.maxZoomScale = 1e6;
SkSafeUnref(canvas);
picture->endRecording();