commit d442aaeb46ea0496611eca8510fa5bf92f306a94
author Chris Craik <ccraik@google.com> Thu Jul 12 16:17:16 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 12 16:17:16 2012 -0700
tree 2970b62fc0e4145350e0e596417072ef09ebe50c
parent 289b55e55d663566f0f8d512b506c6b60c34dcd6
parent 793b7f84541206600fd7792446b75716b046099e

Merge "Don't attach functor for SW layers"

core/java/android/webkit/WebViewClassic.java

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 038dde5..8c30945 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -7911,7 +7911,9 @@
         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