am 6fb27c5a: am 96cfad5d: check for null before calling native webkit from java webview

Merge commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217'

* commit '6fb27c5a68ab4de9d7d4caf737da8effa2f63217':
  check for null before calling native webkit from java webview
This commit is contained in:
Cary Clark
2009-09-25 11:24:51 -07:00
committed by Android Git Automerger

View File

@@ -1650,12 +1650,14 @@ final class WebViewCore {
}
/* package */ synchronized boolean pictureReady() {
return nativePictureReady();
return 0 != mNativeClass ? nativePictureReady() : false;
}
/*package*/ synchronized Picture copyContentPicture() {
Picture result = new Picture();
nativeCopyContentToPicture(result);
if (0 != mNativeClass) {
nativeCopyContentToPicture(result);
}
return result;
}