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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 1689043002: Add WebMediaPlayer::exitedFullscreen() and call it from HTMLMediaElement (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months 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
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 : public blink::WebMediaPlayer, 81 : public blink::WebMediaPlayer,
82 public cc::VideoFrameProvider, 82 public cc::VideoFrameProvider,
83 public StreamTextureFactoryContextObserver, 83 public StreamTextureFactoryContextObserver,
84 public media::RendererMediaPlayerInterface, 84 public media::RendererMediaPlayerInterface,
85 public NON_EXPORTED_BASE(media::WebMediaPlayerDelegate::Observer) { 85 public NON_EXPORTED_BASE(media::WebMediaPlayerDelegate::Observer) {
86 public: 86 public:
87 // Construct a WebMediaPlayerAndroid object. This class communicates with the 87 // Construct a WebMediaPlayerAndroid object. This class communicates with the
88 // MediaPlayerAndroid object in the browser process through |proxy|. 88 // MediaPlayerAndroid object in the browser process through |proxy|.
89 // TODO(qinmin): |frame| argument is used to determine whether the current 89 // TODO(qinmin): |frame| argument is used to determine whether the current
90 // player can enter fullscreen. This logic should probably be moved into 90 // player can enter fullscreen. This logic should probably be moved into
91 // blink, so that enterFullscreen() will not be called if another video is 91 // blink, so that enteredFullscreen() will not be called if another video is
92 // already in fullscreen. 92 // already in fullscreen.
93 WebMediaPlayerAndroid( 93 WebMediaPlayerAndroid(
94 blink::WebFrame* frame, 94 blink::WebFrame* frame,
95 blink::WebMediaPlayerClient* client, 95 blink::WebMediaPlayerClient* client,
96 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, 96 blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
97 base::WeakPtr<media::WebMediaPlayerDelegate> delegate, 97 base::WeakPtr<media::WebMediaPlayerDelegate> delegate,
98 RendererMediaPlayerManager* player_manager, 98 RendererMediaPlayerManager* player_manager,
99 media::CdmFactory* cdm_factory, 99 media::CdmFactory* cdm_factory,
100 scoped_refptr<StreamTextureFactory> factory, 100 scoped_refptr<StreamTextureFactory> factory,
101 int frame_id, 101 int frame_id,
102 bool enable_texture_copy, 102 bool enable_texture_copy,
103 const media::WebMediaPlayerParams& params); 103 const media::WebMediaPlayerParams& params);
104 ~WebMediaPlayerAndroid() override; 104 ~WebMediaPlayerAndroid() override;
105 105
106 // blink::WebMediaPlayer implementation. 106 // blink::WebMediaPlayer implementation.
107 bool supportsOverlayFullscreenVideo() override; 107 bool supportsOverlayFullscreenVideo() override;
108 void enterFullscreen() override; 108 void enteredFullscreen() override;
109 109
110 // Resource loading. 110 // Resource loading.
111 void load(LoadType load_type, 111 void load(LoadType load_type,
112 const blink::WebURL& url, 112 const blink::WebURL& url,
113 CORSMode cors_mode) override; 113 CORSMode cors_mode) override;
114 114
115 // Playback controls. 115 // Playback controls.
116 void play() override; 116 void play() override;
117 void pause() override; 117 void pause() override;
118 void seek(double seconds) override; 118 void seek(double seconds) override;
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 560
561 // NOTE: Weak pointers must be invalidated before all other member variables. 561 // NOTE: Weak pointers must be invalidated before all other member variables.
562 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 562 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
563 563
564 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 564 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
565 }; 565 };
566 566
567 } // namespace content 567 } // namespace content
568 568
569 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 569 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698