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

Side by Side Diff: media/blink/webmediaplayer_cast_android.cc

Issue 1641423002: Re-land extract state management from WebMediaPlayerImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a message loop to the test. Created 4 years, 9 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "media/blink/webmediaplayer_cast_android.h" 5 #include "media/blink/webmediaplayer_cast_android.h"
6 6
7 #include "gpu/GLES2/gl2extchromium.h" 7 #include "gpu/GLES2/gl2extchromium.h"
8 #include "gpu/blink/webgraphicscontext3d_impl.h" 8 #include "gpu/blink/webgraphicscontext3d_impl.h"
9 #include "gpu/command_buffer/client/gles2_interface.h" 9 #include "gpu/command_buffer/client/gles2_interface.h"
10 #include "gpu/command_buffer/common/sync_token.h" 10 #include "gpu/command_buffer/common/sync_token.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 212
213 void WebMediaPlayerCast::OnSeekRequest(const base::TimeDelta& time_to_seek) { 213 void WebMediaPlayerCast::OnSeekRequest(const base::TimeDelta& time_to_seek) {
214 DVLOG(1) << __FUNCTION__; 214 DVLOG(1) << __FUNCTION__;
215 client_->requestSeek(time_to_seek.InSecondsF()); 215 client_->requestSeek(time_to_seek.InSecondsF());
216 } 216 }
217 217
218 void WebMediaPlayerCast::OnSeekComplete(const base::TimeDelta& current_time) { 218 void WebMediaPlayerCast::OnSeekComplete(const base::TimeDelta& current_time) {
219 DVLOG(1) << __FUNCTION__; 219 DVLOG(1) << __FUNCTION__;
220 remote_time_at_ = base::TimeTicks::Now(); 220 remote_time_at_ = base::TimeTicks::Now();
221 remote_time_ = current_time; 221 remote_time_ = current_time;
222 webmediaplayer_->OnPipelineSeeked(true, PIPELINE_OK); 222 webmediaplayer_->OnPipelineSeeked(true);
223 } 223 }
224 224
225 void WebMediaPlayerCast::OnMediaError(int error_type) { 225 void WebMediaPlayerCast::OnMediaError(int error_type) {
226 DVLOG(1) << __FUNCTION__; 226 DVLOG(1) << __FUNCTION__;
227 } 227 }
228 228
229 void WebMediaPlayerCast::OnVideoSizeChanged(int width, int height) { 229 void WebMediaPlayerCast::OnVideoSizeChanged(int width, int height) {
230 DVLOG(1) << __FUNCTION__; 230 DVLOG(1) << __FUNCTION__;
231 } 231 }
232 232
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 368
369 if (!canvas_size.width()) 369 if (!canvas_size.width())
370 return nullptr; 370 return nullptr;
371 371
372 return MakeTextFrameForCast(remote_playback_message_, canvas_size, 372 return MakeTextFrameForCast(remote_playback_message_, canvas_size,
373 webmediaplayer_->naturalSize(), 373 webmediaplayer_->naturalSize(),
374 base::Bind(&GLCBShim, context_3d_cb_)); 374 base::Bind(&GLCBShim, context_3d_cb_));
375 } 375 }
376 376
377 } // namespace media 377 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698