diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 04:38:17 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 04:38:17 +0000 |
| commit | 11387d28032c36724cfe108c544b639c33a6109a (patch) | |
| tree | 49d99ef2a67d94fe295deb8f01277a33427671cd /content/browser/android/surface_texture_peer_browser_impl.h | |
| parent | 51c2e9ad1b2e61ef88fb616c00be7ee11491fd9f (diff) | |
| download | chromium_src-11387d28032c36724cfe108c544b639c33a6109a.zip chromium_src-11387d28032c36724cfe108c544b639c33a6109a.tar.gz chromium_src-11387d28032c36724cfe108c544b639c33a6109a.tar.bz2 | |
Fix a race condition that SurfaceTextureBridge can get released before passing it to the mediaplayer
Use a scoped_refptr to protect SurfaceTextureBridge from being released when DestroyStreamTextureChromium and SetVideoSurface() get called at the same time on GPU and UI thread.
Review URL: https://chromiumcodereview.appspot.com/11092010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161041 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android/surface_texture_peer_browser_impl.h')
| -rw-r--r-- | content/browser/android/surface_texture_peer_browser_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/android/surface_texture_peer_browser_impl.h b/content/browser/android/surface_texture_peer_browser_impl.h index d2685f8..9dd1c59 100644 --- a/content/browser/android/surface_texture_peer_browser_impl.h +++ b/content/browser/android/surface_texture_peer_browser_impl.h @@ -26,7 +26,7 @@ class SurfaceTexturePeerBrowserImpl : public SurfaceTexturePeer { virtual void EstablishSurfaceTexturePeer( base::ProcessHandle render_process_handle, SurfaceTextureTarget type, - jobject j_surface_texture, + scoped_refptr<SurfaceTextureBridge> surface_texture_bridge, int render_view_id, int player_id) OVERRIDE; |