Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash in setNewPicture" into jb-dev

Browse Source
This commit is contained in:
John Reck
2012-04-30 11:31:27 -07:00
committed by Android (Google) Code Review
parent 02d7e489b2 579f4e93fb
commit 3ea8761974
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/webkit/WebViewClassic.java
View File

@@ -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();