diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-02-18 16:02:07 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-18 16:02:07 -0800 |
| commit | c5d1392944f2445721200c02aaf7bc1181772152 (patch) | |
| tree | 36c1bc5934e82426ce2522538720958138b25f8a /WebCore/platform/graphics | |
| parent | 62d524796f15e35cd6e5bf1f0cdad57fcf31b7b1 (diff) | |
| parent | a3107ab7b4fc5af9983e30647ee7b6a19df46a59 (diff) | |
| download | external_webkit-c5d1392944f2445721200c02aaf7bc1181772152.zip external_webkit-c5d1392944f2445721200c02aaf7bc1181772152.tar.gz external_webkit-c5d1392944f2445721200c02aaf7bc1181772152.tar.bz2 | |
Merge "Fix some of the performance issues when using the flash plugin embedded."
Diffstat (limited to 'WebCore/platform/graphics')
| -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() |