drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev

Browse Source
This commit is contained in:
Chris Craik
2012-06-06 16:45:04 -07:00
committed by Android (Google) Code Review
parent b0de6224fc 932b7f6765
commit 8f1f714f83
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/HardwareRenderer.java
View File

@ -1229,7 +1229,7 @@ public abstract class HardwareRenderer {
void detachFunctor(int functor) {
if (mCanvas != null) {
mCanvas.detachFunctor(functor);
} else Log.e(LOG_TAG, "can't detachFunctor, have no canvas");
}
}
@Override

3
core/java/android/view/ViewRootImpl.java
View File

@ -678,9 +678,6 @@ public final class ViewRootImpl implements ViewParent,
}
public void detachFunctor(int functor) {
Log.e(HardwareRenderer.LOG_TAG, String.format("detachFunctor, mHarwareRenderer==null %b, enabled %b",
mAttachInfo.mHardwareRenderer == null,
mAttachInfo.mHardwareRenderer == null ? false : mAttachInfo.mHardwareRenderer.isEnabled()));
if (mAttachInfo.mHardwareRenderer != null && mAttachInfo.mHardwareRenderer.isEnabled()) {
mAttachInfo.mHardwareRenderer.detachFunctor(functor);
}

7
libs/hwui/OpenGLRenderer.cpp
View File

@ -262,10 +262,7 @@ void OpenGLRenderer::resume() {
}
void OpenGLRenderer::detachFunctor(Functor* functor) {
int size = mFunctors.size();
int remove = mFunctors.remove(functor);
ALOGD("OGLR %p detachFunctor %p, removed at index %d of %d",
this, functor, remove, size);
mFunctors.remove(functor);
}
void OpenGLRenderer::attachFunctor(Functor* functor) {
@ -312,7 +309,7 @@ status_t OpenGLRenderer::invokeFunctors(Rect& dirty) {
status_t OpenGLRenderer::callDrawGLFunction(Functor* functor, Rect& dirty) {
interrupt();
mFunctors.remove(functor);
detachFunctor(functor);
if (mDirtyClip) {
setScissorFromClip();