summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-08-08 12:45:36 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-08 12:45:36 -0700
commit02359bf4229259d3576f987ee8b843e7229d66eb (patch)
tree666a4ccc0c5ef026788e2d4c7bbdff891c7ebfde /Source
parent3163fe518b66d1734da1fd7aa94da2d4450afdee (diff)
parentffb129f3d1f955efb74e53050800f596a0ee9ff6 (diff)
downloadexternal_webkit-02359bf4229259d3576f987ee8b843e7229d66eb.zip
external_webkit-02359bf4229259d3576f987ee8b843e7229d66eb.tar.gz
external_webkit-02359bf4229259d3576f987ee8b843e7229d66eb.tar.bz2
Merge "Return NativeWindow on subsequent requests for the plugin's surface."
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/platform/graphics/android/MediaLayer.cpp6
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;
}