diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-08-05 16:47:55 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2011-08-05 16:47:55 -0400 |
| commit | ffb129f3d1f955efb74e53050800f596a0ee9ff6 (patch) | |
| tree | 64d92359bfda72c9e7bcedcade8065744d18c9ce | |
| parent | da141e6dd5b22d57092eb5bbbeef6ea5e9d28430 (diff) | |
| download | external_webkit-ffb129f3d1f955efb74e53050800f596a0ee9ff6.zip external_webkit-ffb129f3d1f955efb74e53050800f596a0ee9ff6.tar.gz external_webkit-ffb129f3d1f955efb74e53050800f596a0ee9ff6.tar.bz2 | |
Return NativeWindow on subsequent requests for the plugin's surface.
bug: 5114637
Change-Id: I08213be77036d6e8918bfec3915fcf09210c4f8c
| -rw-r--r-- | Source/WebCore/platform/graphics/android/MediaLayer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/MediaLayer.cpp b/Source/WebCore/platform/graphics/android/MediaLayer.cpp index 1d5ce3f..ae65173 100644 --- a/Source/WebCore/platform/graphics/android/MediaLayer.cpp +++ b/Source/WebCore/platform/graphics/android/MediaLayer.cpp @@ -109,7 +109,11 @@ bool MediaLayer::drawGL(GLWebViewState* glWebViewState, SkMatrix& matrix) ANativeWindow* MediaLayer::acquireNativeWindowForContent() { - return m_contentTexture->requestNewWindow(); + ANativeWindow* anw = m_contentTexture->getNativeWindow(); + if (!anw) { + anw = m_contentTexture->requestNewWindow(); + } + return anw; } |