diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-10-28 12:39:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-28 12:39:49 -0700 |
| commit | c5d840baeea0b171c64e9746942d95e95a7f7769 (patch) | |
| tree | 78dcd9f53e6dfaa45a611bced9e5504346a0df89 /Source | |
| parent | 3b9a114e4f6b7f2510ca2df9a2ee569bc1dee857 (diff) | |
| parent | bf6900fe796a697400203ab777001716f3d83a0a (diff) | |
| download | external_webkit-c5d840baeea0b171c64e9746942d95e95a7f7769.zip external_webkit-c5d840baeea0b171c64e9746942d95e95a7f7769.tar.gz external_webkit-c5d840baeea0b171c64e9746942d95e95a7f7769.tar.bz2 | |
Merge "Fix plugin rendering bug when video surface is not ready." into ics-mr1
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/MediaTexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/MediaTexture.cpp b/Source/WebCore/platform/graphics/android/MediaTexture.cpp index 3b215ee..1676186 100644 --- a/Source/WebCore/platform/graphics/android/MediaTexture.cpp +++ b/Source/WebCore/platform/graphics/android/MediaTexture.cpp @@ -159,7 +159,7 @@ void MediaTexture::draw(const TransformationMatrix& contentMatrix, if (!video->surfaceTexture.get() || video->dimensions.isEmpty() || !video->mediaListener->isFrameAvailable()) - return; + continue; video->surfaceTexture->updateTexImage(); |