diff options
| author | Chris Craik <ccraik@google.com> | 2012-07-12 16:17:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-12 16:17:16 -0700 |
| commit | d442aaeb46ea0496611eca8510fa5bf92f306a94 (patch) | |
| tree | 2970b62fc0e4145350e0e596417072ef09ebe50c /core/java/android/webkit/WebViewClassic.java | |
| parent | 289b55e55d663566f0f8d512b506c6b60c34dcd6 (diff) | |
| parent | 793b7f84541206600fd7792446b75716b046099e (diff) | |
Merge "Don't attach functor for SW layers"
Diffstat (limited to 'core/java/android/webkit/WebViewClassic.java')
| -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 038dde51c1d0..8c3094550b88 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -7911,7 +7911,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc int functor = 0; boolean forceInval = isPictureAfterFirstLayout; ViewRootImpl viewRoot = mWebView.getViewRootImpl(); - if (mWebView.isHardwareAccelerated() && viewRoot != null) { + if (mWebView.isHardwareAccelerated() + && mWebView.getLayerType() != View.LAYER_TYPE_SOFTWARE + && viewRoot != null) { functor = nativeGetDrawGLFunction(mNativeClass); if (functor != 0) { // force an invalidate if functor attach not successful |