diff options
| author | Grace Kloba <klobag@google.com> | 2010-01-11 15:36:37 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2010-01-11 15:36:37 -0800 |
| commit | 4c7ec8d6ab11408b6a9767b50c9fa73a834fe9a4 (patch) | |
| tree | b697e735448114abb3bfe7ba84e58192a3c2e288 /core/java/android | |
| parent | 17acf1747fe0b88964f1407ac266ca703d9b190d (diff) | |
| download | frameworks_base-4c7ec8d6ab11408b6a9767b50c9fa73a834fe9a4.zip frameworks_base-4c7ec8d6ab11408b6a9767b50c9fa73a834fe9a4.tar.gz frameworks_base-4c7ec8d6ab11408b6a9767b50c9fa73a834fe9a4.tar.bz2 | |
As setNewZoomScale is called asynchronously, the
WebView can be destroyed. If it is, skip scaling.
Fix http://b/issue?id=2366538
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index b10d786..3c6cd9c 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -3892,7 +3892,9 @@ public class WebView extends AbsoluteLayout public void run() { // we always force, in case our height changed, in which case we // still want to send the notification over to webkit - setNewZoomScale(mActualScale, true); + if (mWebViewCore != null) { + setNewZoomScale(mActualScale, true); + } } }); } |