From 793b7f84541206600fd7792446b75716b046099e Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Thu, 12 Jul 2012 14:01:50 -0700
Subject: Don't attach functor for SW layers

Change-Id: I60fec1629bf1e343a0d69e0ce13a3d632c3f713d
---
 core/java/android/webkit/WebViewClassic.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/java/android/webkit/WebViewClassic.java')

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 251ddf70aa92..1f17fb9a9bd6 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -7910,7 +7910,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
-- 
cgit v1.2.3