diff options
| author | Romain Guy <romainguy@google.com> | 2012-10-07 18:00:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-07 18:00:41 -0700 |
| commit | 133fcdf44bccbda1fe7931bca7d911806435491b (patch) | |
| tree | e7b837fab1223567df4ebb47efa7dc6f4f5279fd /core/java/android | |
| parent | 118f484424f3e5649833df42a7e613f41b2b2ecd (diff) | |
| parent | 52b307ebc86e12e368694442eb8751e7e0de239e (diff) | |
Merge "Clear draw flags when updating TextureView's layer Bug #7171323" into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/TextureView.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index a9b6e097daf4..230f426626a0 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -224,6 +224,8 @@ public class TextureView extends View { private void destroySurface() { if (mLayer != null) { mSurface.detachFromGLContext(); + // SurfaceTexture owns the texture name and detachFromGLContext + // should have deleted it mLayer.clearStorage(); boolean shouldRelease = true; @@ -291,6 +293,9 @@ public class TextureView extends View { */ @Override public final void draw(Canvas canvas) { + // NOTE: Maintain this carefully (see View.java) + mPrivateFlags = (mPrivateFlags & ~PFLAG_DIRTY_MASK) | PFLAG_DRAWN; + applyUpdate(); applyTransformMatrix(); } @@ -335,6 +340,10 @@ public class TextureView extends View { @Override HardwareLayer getHardwareLayer() { + // NOTE: Maintain these two lines very carefully (see View.java) + mPrivateFlags |= PFLAG_DRAWN | PFLAG_DRAWING_CACHE_VALID; + mPrivateFlags &= ~PFLAG_DIRTY_MASK; + if (mLayer == null) { if (mAttachInfo == null || mAttachInfo.mHardwareRenderer == null) { return null; @@ -773,6 +782,7 @@ public class TextureView extends View { * Invoked when the specified {@link SurfaceTexture} is about to be destroyed. * If returns true, no rendering should happen inside the surface texture after this method * is invoked. If returns false, the client needs to call {@link SurfaceTexture#release()}. + * Most applications should return true. * * @param surface The surface about to be destroyed */ |