diff options
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index cb160f9..b6fe6d8 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -7887,14 +7887,14 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mSendScrollEvent = true; int functor = 0; - if (mWebView.isHardwareAccelerated() - || mWebView.getLayerType() != View.LAYER_TYPE_HARDWARE) { + ViewRootImpl viewRoot = mWebView.getViewRootImpl(); + if (mWebView.isHardwareAccelerated() && viewRoot != null) { functor = nativeGetDrawGLFunction(mNativeClass); + viewRoot.attachFunctor(functor); } - if (functor != 0) { - mWebView.getViewRootImpl().attachFunctor(functor); - } else { + if (functor == 0 + || mWebView.getLayerType() != View.LAYER_TYPE_NONE) { // invalidate the screen so that the next repaint will show new content // TODO: partial invalidate mWebView.invalidate(); |