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

Side by Side Diff: content/renderer/media/webmediaplayer_ms.cc

Issue 2437343002: Take one-shot focus for WebRTC on Android (Closed)
Patch Set: Take one-shot focus for WebRTC Created 4 years, 2 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 | no next file » | 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 #include "content/renderer/media/webmediaplayer_ms.h" 5 #include "content/renderer/media/webmediaplayer_ms.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 177
178 compositor_->StartRendering(); 178 compositor_->StartRendering();
179 179
180 if (audio_renderer_) 180 if (audio_renderer_)
181 audio_renderer_->Play(); 181 audio_renderer_->Play();
182 182
183 if (delegate_) { 183 if (delegate_) {
184 // TODO(perkj, magjed): We use Uncontrollable type here to avoid creating an 184 // TODO(perkj, magjed): We use Uncontrollable type here to avoid creating an
185 // interactive media session on Android. See http://crbug.com/596516 for 185 // interactive media session on Android. See http://crbug.com/596516 for
186 // more details. 186 // more details.
187 #if defined(OS_ANDROID)
188 delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false,
189 media::MediaContentType::Uncontrollable);
190 #else // defined(OS_ANDROID)
191 delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false, 187 delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false,
192 media::MediaContentType::Persistent); 188 media::MediaContentType::Persistent);
193 #endif // defined(OS_ANDROID)
194 } 189 }
195 190
196 paused_ = false; 191 paused_ = false;
197 } 192 }
198 193
199 void WebMediaPlayerMS::pause() { 194 void WebMediaPlayerMS::pause() {
200 DVLOG(1) << __func__; 195 DVLOG(1) << __func__;
201 DCHECK(thread_checker_.CalledOnValidThread()); 196 DCHECK(thread_checker_.CalledOnValidThread());
202 197
203 should_play_upon_shown_ = false; 198 should_play_upon_shown_ = false;
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 void WebMediaPlayerMS::ResetCanvasCache() { 560 void WebMediaPlayerMS::ResetCanvasCache() {
566 DCHECK(thread_checker_.CalledOnValidThread()); 561 DCHECK(thread_checker_.CalledOnValidThread());
567 video_renderer_.ResetCache(); 562 video_renderer_.ResetCache();
568 } 563 }
569 564
570 void WebMediaPlayerMS::TriggerResize() { 565 void WebMediaPlayerMS::TriggerResize() {
571 get_client()->sizeChanged(); 566 get_client()->sizeChanged();
572 } 567 }
573 568
574 } // namespace content 569 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698