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

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

Issue 2619593002: Avoid overriding methods from both blink and non-blink at once. (Closed)
Patch Set: Created 3 years, 11 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 | « media/blink/webmediaplayer_cast_android.h ('k') | media/blink/webmediaplayer_impl.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 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/command_buffer/client/gles2_interface.h" 8 #include "gpu/command_buffer/client/gles2_interface.h"
9 #include "gpu/command_buffer/common/sync_token.h" 9 #include "gpu/command_buffer/common/sync_token.h"
10 #include "media/base/android/media_common_android.h" 10 #include "media/base/android/media_common_android.h"
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 } 332 }
333 333
334 void WebMediaPlayerCast::OnRemoteRouteAvailabilityChanged( 334 void WebMediaPlayerCast::OnRemoteRouteAvailabilityChanged(
335 blink::WebRemotePlaybackAvailability availability) { 335 blink::WebRemotePlaybackAvailability availability) {
336 DVLOG(1) << __func__; 336 DVLOG(1) << __func__;
337 client_->remoteRouteAvailabilityChanged(availability); 337 client_->remoteRouteAvailabilityChanged(availability);
338 } 338 }
339 339
340 void WebMediaPlayerCast::SuspendAndReleaseResources() {} 340 void WebMediaPlayerCast::SuspendAndReleaseResources() {}
341 341
342 bool WebMediaPlayerCast::hasVideo() const {
343 return true;
344 }
345
346 bool WebMediaPlayerCast::paused() const {
347 return paused_;
348 }
349
350 void WebMediaPlayerCast::SetDeviceScaleFactor(float scale_factor) { 342 void WebMediaPlayerCast::SetDeviceScaleFactor(float scale_factor) {
351 device_scale_factor_ = scale_factor; 343 device_scale_factor_ = scale_factor;
352 } 344 }
353 345
354 scoped_refptr<VideoFrame> WebMediaPlayerCast::GetCastingBanner() { 346 scoped_refptr<VideoFrame> WebMediaPlayerCast::GetCastingBanner() {
355 DVLOG(1) << __func__; 347 DVLOG(1) << __func__;
356 348
357 // TODO(johnme): Should redraw this frame if the layer bounds change; but 349 // TODO(johnme): Should redraw this frame if the layer bounds change; but
358 // there seems no easy way to listen for the layer resizing (as opposed to 350 // there seems no easy way to listen for the layer resizing (as opposed to
359 // OnVideoSizeChanged, which is when the frame sizes of the video file 351 // OnVideoSizeChanged, which is when the frame sizes of the video file
(...skipping 13 matching lines...) Expand all
373 return MakeTextFrameForCast(remote_playback_message_, canvas_size, 365 return MakeTextFrameForCast(remote_playback_message_, canvas_size,
374 webmediaplayer_->naturalSize(), 366 webmediaplayer_->naturalSize(),
375 base::Bind(&GLCBShim, context_3d_cb_)); 367 base::Bind(&GLCBShim, context_3d_cb_));
376 } 368 }
377 369
378 void WebMediaPlayerCast::setPoster(const blink::WebURL& poster) { 370 void WebMediaPlayerCast::setPoster(const blink::WebURL& poster) {
379 player_manager_->SetPoster(player_id_, poster); 371 player_manager_->SetPoster(player_id_, poster);
380 } 372 }
381 373
382 } // namespace media 374 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_cast_android.h ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698