diff options
| author | John Reck <jreck@google.com> | 2012-04-30 13:37:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 13:37:05 -0700 |
| commit | 9e2b578fffee37e717b936d43b52d30b18bf64ce (patch) | |
| tree | 6ecab933f377b246ffe4e2ffe68cf5e4cc458900 | |
| parent | 8e01ee57c331913d51ef9336e304dca73edb9571 (diff) | |
| parent | 1266692b307e1496b31dfc3c1f7e202babf7eb41 (diff) | |
| download | frameworks_base-9e2b578fffee37e717b936d43b52d30b18bf64ce.zip frameworks_base-9e2b578fffee37e717b936d43b52d30b18bf64ce.tar.gz frameworks_base-9e2b578fffee37e717b936d43b52d30b18bf64ce.tar.bz2 | |
Merge "never attach null functor" into jb-dev
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index b6fe6d8..a9b32b8 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -7890,7 +7890,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc ViewRootImpl viewRoot = mWebView.getViewRootImpl(); if (mWebView.isHardwareAccelerated() && viewRoot != null) { functor = nativeGetDrawGLFunction(mNativeClass); - viewRoot.attachFunctor(functor); + if (functor != 0) { + viewRoot.attachFunctor(functor); + } } if (functor == 0 |