diff options
| author | Patrick Scott <phanna@android.com> | 2010-12-03 17:00:49 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-12-03 17:03:53 -0500 |
| commit | 2e99fe47543f09c4d9e797beff199b62e0c5c2a3 (patch) | |
| tree | f80c88e86e02f3ec7b9b27ce8ab98e36af800eea /WebKit/android/jni/WebViewCore.cpp | |
| parent | bdcd7f7c0d0e30383348e44f036c974501577db1 (diff) | |
| download | external_webkit-2e99fe47543f09c4d9e797beff199b62e0c5c2a3.zip external_webkit-2e99fe47543f09c4d9e797beff199b62e0c5c2a3.tar.gz external_webkit-2e99fe47543f09c4d9e797beff199b62e0c5c2a3.tar.bz2 | |
Fix gmail crash with HW acceleration.
Bug: 3252105
Change-Id: I78801b603d46c4cbe1b8d26b47f8748bb5e3df2c
Diffstat (limited to 'WebKit/android/jni/WebViewCore.cpp')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 8c90629..ec701f9 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -3569,8 +3569,10 @@ static jint UpdateLayers(JNIEnv *env, jobject obj, jobject region) if (result) { SkIRect bounds; LayerAndroid* root = static_cast<LayerAndroid*>(result->getChild(0)); - root->bounds().roundOut(&bounds); - nativeRegion->setRect(bounds); + if (root) { + root->bounds().roundOut(&bounds); + nativeRegion->setRect(bounds); + } } return reinterpret_cast<jint>(result); } |