Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1927)

Unified Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 1385883002: Leave CreateStreamTexture route id out of the GL interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing TOT! Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 59859ff1dbc4c4cf49bc805485976b5a12030b5f..2734bf894c542afb0dcf1de44c7e81ed46e34983 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -95,6 +95,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
RendererMediaPlayerManager* player_manager,
media::CdmFactory* cdm_factory,
scoped_refptr<StreamTextureFactory> factory,
+ int frame_id,
const media::WebMediaPlayerParams& params);
virtual ~WebMediaPlayerAndroid();
@@ -531,6 +532,8 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
scoped_ptr<MediaSourceDelegate> media_source_delegate_;
+ int frame_id_;
+
// NOTE: Weak pointers must be invalidated before all other member variables.
base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698