diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-02-18 19:58:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-18 19:58:00 -0800 |
| commit | ffef3d3a1baae44ba44696024ddc12f92337d518 (patch) | |
| tree | 15c1faccc5651827493731408ab6ab7b1026b08a /WebCore/platform | |
| parent | b1c4dba88c350dca089fc918e923d77052df750c (diff) | |
| parent | 6f7a546a8676227fcd810149bce26090ab1e49eb (diff) | |
| download | external_webkit-ffef3d3a1baae44ba44696024ddc12f92337d518.zip external_webkit-ffef3d3a1baae44ba44696024ddc12f92337d518.tar.gz external_webkit-ffef3d3a1baae44ba44696024ddc12f92337d518.tar.bz2 | |
am 6f7a546a: Do not merge: Cherry-pick Flash performance CL from Master
* commit '6f7a546a8676227fcd810149bce26090ab1e49eb':
Do not merge: Cherry-pick Flash performance CL from Master
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/MediaLayer.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/android/MediaLayer.cpp b/WebCore/platform/graphics/android/MediaLayer.cpp index ad4fc76..d8bbefc 100644 --- a/WebCore/platform/graphics/android/MediaLayer.cpp +++ b/WebCore/platform/graphics/android/MediaLayer.cpp @@ -78,8 +78,6 @@ bool MediaLayer::drawGL(SkMatrix& matrix) // draw any video content if present m_videoTexture->drawVideo(drawTransform()); - bool needsInval = true; - // draw the primary content if (m_bufferedTexture) { TextureInfo* textureInfo = m_bufferedTexture->consumerLock(); @@ -103,14 +101,11 @@ bool MediaLayer::drawGL(SkMatrix& matrix) textureInfo->m_textureId, 1.0f, forceBlending); } - - if (!rect.isEmpty()) - needsInval = false; } m_bufferedTexture->consumerRelease(); } - return drawChildrenGL(matrix) || needsInval; + return drawChildrenGL(matrix); } ANativeWindow* MediaLayer::acquireNativeWindowForVideo() |