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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 // blink, so that enterFullscreen() will not be called if another video is 88 // blink, so that enterFullscreen() will not be called if another video is
89 // already in fullscreen. 89 // already in fullscreen.
90 WebMediaPlayerAndroid( 90 WebMediaPlayerAndroid(
91 blink::WebFrame* frame, 91 blink::WebFrame* frame,
92 blink::WebMediaPlayerClient* client, 92 blink::WebMediaPlayerClient* client,
93 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 93 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
94 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, 94 base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
95 RendererMediaPlayerManager* player_manager, 95 RendererMediaPlayerManager* player_manager,
96 media::CdmFactory* cdm_factory, 96 media::CdmFactory* cdm_factory,
97 scoped_refptr<StreamTextureFactory> factory, 97 scoped_refptr<StreamTextureFactory> factory,
98 int frame_id,
98 const media::WebMediaPlayerParams& params); 99 const media::WebMediaPlayerParams& params);
99 virtual ~WebMediaPlayerAndroid(); 100 virtual ~WebMediaPlayerAndroid();
100 101
101 // blink::WebMediaPlayer implementation. 102 // blink::WebMediaPlayer implementation.
102 virtual bool supportsOverlayFullscreenVideo(); 103 virtual bool supportsOverlayFullscreenVideo();
103 virtual void enterFullscreen(); 104 virtual void enterFullscreen();
104 105
105 // Resource loading. 106 // Resource loading.
106 virtual void load(LoadType load_type, 107 virtual void load(LoadType load_type,
107 const blink::WebURL& url, 108 const blink::WebURL& url,
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 525
525 // base::TickClock used by |interpolator_|. 526 // base::TickClock used by |interpolator_|.
526 base::DefaultTickClock default_tick_clock_; 527 base::DefaultTickClock default_tick_clock_;
527 528
528 // Tracks the most recent media time update and provides interpolated values 529 // Tracks the most recent media time update and provides interpolated values
529 // as playback progresses. 530 // as playback progresses.
530 media::TimeDeltaInterpolator interpolator_; 531 media::TimeDeltaInterpolator interpolator_;
531 532
532 scoped_ptr<MediaSourceDelegate> media_source_delegate_; 533 scoped_ptr<MediaSourceDelegate> media_source_delegate_;
533 534
535 int frame_id_;
536
534 // NOTE: Weak pointers must be invalidated before all other member variables. 537 // NOTE: Weak pointers must be invalidated before all other member variables.
535 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 538 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
536 539
537 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 540 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
538 }; 541 };
539 542
540 } // namespace content 543 } // namespace content
541 544
542 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 545 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698