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

Side by Side Diff: media/blink/webmediaplayer_impl.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.cc ('k') | 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 "media/blink/webmediaplayer_impl.h" 5 #include "media/blink/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <limits> 9 #include <limits>
10 #include <string> 10 #include <string>
(...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 DCHECK(main_task_runner_->BelongsToCurrentThread()); 682 DCHECK(main_task_runner_->BelongsToCurrentThread());
683 683
684 return blink::WebSize(pipeline_metadata_.natural_size); 684 return blink::WebSize(pipeline_metadata_.natural_size);
685 } 685 }
686 686
687 bool WebMediaPlayerImpl::paused() const { 687 bool WebMediaPlayerImpl::paused() const {
688 DCHECK(main_task_runner_->BelongsToCurrentThread()); 688 DCHECK(main_task_runner_->BelongsToCurrentThread());
689 689
690 #if defined(OS_ANDROID) // WMPI_CAST 690 #if defined(OS_ANDROID) // WMPI_CAST
691 if (isRemote()) 691 if (isRemote())
692 return cast_impl_.paused(); 692 return cast_impl_.IsPaused();
693 #endif 693 #endif
694 694
695 return pipeline_.GetPlaybackRate() == 0.0f; 695 return pipeline_.GetPlaybackRate() == 0.0f;
696 } 696 }
697 697
698 bool WebMediaPlayerImpl::seeking() const { 698 bool WebMediaPlayerImpl::seeking() const {
699 DCHECK(main_task_runner_->BelongsToCurrentThread()); 699 DCHECK(main_task_runner_->BelongsToCurrentThread());
700 700
701 if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing) 701 if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing)
702 return false; 702 return false;
(...skipping 1331 matching lines...) Expand 10 before | Expand all | Expand 10 after
2034 return pipeline_metadata_.video_rotation == VIDEO_ROTATION_0; 2034 return pipeline_metadata_.video_rotation == VIDEO_ROTATION_0;
2035 } 2035 }
2036 2036
2037 void WebMediaPlayerImpl::ActivateViewportIntersectionMonitoring(bool activate) { 2037 void WebMediaPlayerImpl::ActivateViewportIntersectionMonitoring(bool activate) {
2038 DCHECK(main_task_runner_->BelongsToCurrentThread()); 2038 DCHECK(main_task_runner_->BelongsToCurrentThread());
2039 2039
2040 client_->activateViewportIntersectionMonitoring(activate); 2040 client_->activateViewportIntersectionMonitoring(activate);
2041 } 2041 }
2042 2042
2043 } // namespace media 2043 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/webmediaplayer_cast_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698