Index: content/renderer/media/android/webmediaplayer_android.h |
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h |
index d338a4cc343c6b5fef57be40392a8d44f98f81c6..78534f61eb9513000af50dc5a361355d1c84e864 100644 |
--- a/content/renderer/media/android/webmediaplayer_android.h |
+++ b/content/renderer/media/android/webmediaplayer_android.h |
@@ -72,7 +72,8 @@ class WebContentDecryptionModuleImpl; |
// player. |
class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
public cc::VideoFrameProvider, |
- public RenderFrameObserver { |
+ public RenderFrameObserver, |
+ public StreamTextureFactoryContextObserver { |
public: |
// Construct a WebMediaPlayerAndroid object. This class communicates with the |
// MediaPlayerAndroid object in the browser process through |proxy|. |
@@ -199,6 +200,9 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
void OnMediaPlayerPause(); |
void OnRequestFullscreen(); |
+ // StreamTextureFactoryContextObserver implementation. |
+ virtual void ResetStreamTextureProxy() OVERRIDE; |
+ |
// Called when the player is released. |
virtual void OnPlayerReleased(); |
@@ -414,6 +418,8 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
bool needs_establish_peer_; |
// Whether |stream_texture_proxy_| is initialized. |
+ // Accessed on main thread and on compositor thread when main thread is |
+ // blocked. |
bool stream_texture_proxy_initialized_; |
qinmin
2014/09/15 17:16:26
Is this variable still needed?
boliu
2014/09/15 17:54:07
Removed
|
// Whether the video size info is available. |
@@ -424,6 +430,8 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
// Object for calling back the compositor thread to repaint the video when a |
// frame available. It should be initialized on the compositor thread. |
+ // Accessed on main thread and on compositor thread when main thread is |
+ // blocked. |
ScopedStreamTextureProxy stream_texture_proxy_; |
// Whether media player needs external surface. |
@@ -435,6 +443,8 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
// A pointer back to the compositor to inform it about state changes. This is |
// not NULL while the compositor is actively using this webmediaplayer. |
+ // Accessed on main thread and on compositor thread when main thread is |
+ // blocked. |
cc::VideoFrameProvider::Client* video_frame_provider_client_; |
scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_; |