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 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1322 surface_created_cb.Run(fullscreen_surface_id_); | 1322 surface_created_cb.Run(fullscreen_surface_id_); |
1323 else | 1323 else |
1324 pending_surface_request_cb_ = surface_created_cb; | 1324 pending_surface_request_cb_ = surface_created_cb; |
1325 } else { | 1325 } else { |
1326 // Tell the decoder to create its own surface. | 1326 // Tell the decoder to create its own surface. |
1327 surface_created_cb.Run(SurfaceManager::kNoSurfaceID); | 1327 surface_created_cb.Run(SurfaceManager::kNoSurfaceID); |
1328 } | 1328 } |
1329 } | 1329 } |
1330 | 1330 |
1331 std::unique_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() { | 1331 std::unique_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() { |
1332 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | |
1333 switches::kForceMediaPlayerStartingInFullscreenMode)) { | |
1334 enteredFullscreen(); | |
liberato (no reviews please)
2016/07/14 16:26:58
what happens if blink really does enter / exit ful
AndyWu
2016/07/14 19:02:08
Done.
Doing nothing in enter/exit full screen is n
| |
1335 } | |
1336 | |
1332 RequestSurfaceCB request_surface_cb; | 1337 RequestSurfaceCB request_surface_cb; |
1333 #if defined(OS_ANDROID) | 1338 #if defined(OS_ANDROID) |
1334 request_surface_cb = | 1339 request_surface_cb = |
1335 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnSurfaceRequested); | 1340 BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnSurfaceRequested); |
1336 #endif | 1341 #endif |
1337 return renderer_factory_->CreateRenderer( | 1342 return renderer_factory_->CreateRenderer( |
1338 media_task_runner_, worker_task_runner_, audio_source_provider_.get(), | 1343 media_task_runner_, worker_task_runner_, audio_source_provider_.get(), |
1339 compositor_, request_surface_cb); | 1344 compositor_, request_surface_cb); |
1340 } | 1345 } |
1341 | 1346 |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1690 if (isRemote()) | 1695 if (isRemote()) |
1691 return; | 1696 return; |
1692 #endif | 1697 #endif |
1693 | 1698 |
1694 // Idle timeout chosen arbitrarily. | 1699 // Idle timeout chosen arbitrarily. |
1695 background_pause_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(5), | 1700 background_pause_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(5), |
1696 this, &WebMediaPlayerImpl::OnPause); | 1701 this, &WebMediaPlayerImpl::OnPause); |
1697 } | 1702 } |
1698 | 1703 |
1699 } // namespace media | 1704 } // namespace media |
OLD | NEW |