| OLD | NEW |
| 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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 void WebMediaPlayerImpl::enteredFullscreen() { | 334 void WebMediaPlayerImpl::enteredFullscreen() { |
| 335 if (!force_video_overlays_ && !disable_fullscreen_video_overlays_) | 335 if (!force_video_overlays_ && !disable_fullscreen_video_overlays_) |
| 336 EnableOverlay(); | 336 EnableOverlay(); |
| 337 } | 337 } |
| 338 | 338 |
| 339 void WebMediaPlayerImpl::exitedFullscreen() { | 339 void WebMediaPlayerImpl::exitedFullscreen() { |
| 340 if (!force_video_overlays_ && !disable_fullscreen_video_overlays_) | 340 if (!force_video_overlays_ && !disable_fullscreen_video_overlays_) |
| 341 DisableOverlay(); | 341 DisableOverlay(); |
| 342 } | 342 } |
| 343 | 343 |
| 344 void WebMediaPlayerImpl::enterFullWindow() { |
| 345 is_full_window_ = true; |
| 346 // TODO(xjz): merges with cl: https://codereview.chromium.org/2389473002/ to |
| 347 // notify the MediaObserver. |
| 348 } |
| 349 |
| 350 bool WebMediaPlayerImpl::isFullWindow() { |
| 351 return is_full_window_; |
| 352 } |
| 353 |
| 354 void WebMediaPlayerImpl::exitFullWindow() { |
| 355 is_full_window_ = false; |
| 356 // TODO(xjz): merges with cl: https://codereview.chromium.org/2389473002/ to |
| 357 // notify the MediaObserver. |
| 358 } |
| 359 |
| 344 void WebMediaPlayerImpl::DoLoad(LoadType load_type, | 360 void WebMediaPlayerImpl::DoLoad(LoadType load_type, |
| 345 const blink::WebURL& url, | 361 const blink::WebURL& url, |
| 346 CORSMode cors_mode) { | 362 CORSMode cors_mode) { |
| 347 DVLOG(1) << __func__; | 363 DVLOG(1) << __func__; |
| 348 DCHECK(main_task_runner_->BelongsToCurrentThread()); | 364 DCHECK(main_task_runner_->BelongsToCurrentThread()); |
| 349 | 365 |
| 350 GURL gurl(url); | 366 GURL gurl(url); |
| 351 ReportMetrics(load_type, gurl, frame_->getSecurityOrigin()); | 367 ReportMetrics(load_type, gurl, frame_->getSecurityOrigin()); |
| 352 | 368 |
| 353 // Set subresource URL for crash reporting. | 369 // Set subresource URL for crash reporting. |
| (...skipping 1482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1836 pipeline_metadata_.natural_size, | 1852 pipeline_metadata_.natural_size, |
| 1837 base::Bind(&GetCurrentTimeInternal, this))); | 1853 base::Bind(&GetCurrentTimeInternal, this))); |
| 1838 watch_time_reporter_->OnVolumeChange(volume_); | 1854 watch_time_reporter_->OnVolumeChange(volume_); |
| 1839 if (delegate_ && delegate_->IsHidden()) | 1855 if (delegate_ && delegate_->IsHidden()) |
| 1840 watch_time_reporter_->OnHidden(); | 1856 watch_time_reporter_->OnHidden(); |
| 1841 else | 1857 else |
| 1842 watch_time_reporter_->OnShown(); | 1858 watch_time_reporter_->OnShown(); |
| 1843 } | 1859 } |
| 1844 | 1860 |
| 1845 } // namespace media | 1861 } // namespace media |
| OLD | NEW |