diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-10-28 22:27:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-28 22:27:40 +0000 |
| commit | 390c7837e387e1139ea391060a364bb22ed6a25b (patch) | |
| tree | abf7f6aa4fae83282c9e7191dfc172f2a5becc3d /Source | |
| parent | 78bdd5946b724447f53daddbe1209823e6f70fbd (diff) | |
| parent | c5d840baeea0b171c64e9746942d95e95a7f7769 (diff) | |
| download | external_webkit-390c7837e387e1139ea391060a364bb22ed6a25b.zip external_webkit-390c7837e387e1139ea391060a364bb22ed6a25b.tar.gz external_webkit-390c7837e387e1139ea391060a364bb22ed6a25b.tar.bz2 | |
am c5d840ba: Merge "Fix plugin rendering bug when video surface is not ready." into ics-mr1
* commit 'c5d840baeea0b171c64e9746942d95e95a7f7769':
Fix plugin rendering bug when video surface is not ready.
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(); |