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

am 9e2b578f: Merge "never attach null functor" into jb-dev

Browse Source 
* commit '9e2b578fffee37e717b936d43b52d30b18bf64ce':
  never attach null functor
This commit is contained in:
John Reck
2012-04-30 13:39:01 -07:00
committed by Android Git Automerger
parent 09353bb04e 9e2b578fff
commit 89dbba3514
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7890,7 +7890,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
ViewRootImpl viewRoot = mWebView.getViewRootImpl();
if (mWebView.isHardwareAccelerated() && viewRoot != null) {
functor = nativeGetDrawGLFunction(mNativeClass);
viewRoot.attachFunctor(functor);
if (functor != 0) {
viewRoot.attachFunctor(functor);
}
}
if (functor == 0