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 "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2791 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2791 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
2792 media::RemotingController* remoting_controller_ptr = | 2792 media::RemotingController* remoting_controller_ptr = |
2793 remoting_controller.get(); | 2793 remoting_controller.get(); |
2794 media_renderer_factory = base::MakeUnique<media::RemotingRendererFactory>( | 2794 media_renderer_factory = base::MakeUnique<media::RemotingRendererFactory>( |
2795 std::move(media_renderer_factory), std::move(remoting_controller)); | 2795 std::move(media_renderer_factory), std::move(remoting_controller)); |
2796 #endif | 2796 #endif |
2797 | 2797 |
2798 if (!url_index_.get() || url_index_->frame() != frame_) | 2798 if (!url_index_.get() || url_index_->frame() != frame_) |
2799 url_index_.reset(new media::UrlIndex(frame_)); | 2799 url_index_.reset(new media::UrlIndex(frame_)); |
2800 | 2800 |
| 2801 // needs to be updated when we dynamically switch to vr |
2801 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( | 2802 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
2802 frame_, client, encrypted_client, | 2803 frame_, client, encrypted_client, |
2803 GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2804 GetWebMediaPlayerDelegate()->AsWeakPtr(), |
2804 std::move(media_renderer_factory), url_index_, params); | 2805 std::move(media_renderer_factory), url_index_, params); |
2805 | 2806 |
| 2807 media_player->SetInVr(render_view_->screen_info().in_vr); |
| 2808 |
2806 #if defined(OS_ANDROID) // WMPI_CAST | 2809 #if defined(OS_ANDROID) // WMPI_CAST |
2807 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); | 2810 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); |
2808 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); | 2811 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); |
2809 media_player->SetUseFallbackPath(use_fallback_path); | 2812 media_player->SetUseFallbackPath(use_fallback_path); |
2810 #endif // defined(OS_ANDROID) | 2813 #endif // defined(OS_ANDROID) |
2811 | 2814 |
2812 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2815 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
2813 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind( | 2816 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind( |
2814 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr())); | 2817 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr())); |
2815 #endif | 2818 #endif |
(...skipping 3733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6549 // event target. Potentially a Pepper plugin will receive the event. | 6552 // event target. Potentially a Pepper plugin will receive the event. |
6550 // In order to tell whether a plugin gets the last mouse event and which it | 6553 // In order to tell whether a plugin gets the last mouse event and which it |
6551 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6554 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6552 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6555 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6553 // |pepper_last_mouse_event_target_|. | 6556 // |pepper_last_mouse_event_target_|. |
6554 pepper_last_mouse_event_target_ = nullptr; | 6557 pepper_last_mouse_event_target_ = nullptr; |
6555 #endif | 6558 #endif |
6556 } | 6559 } |
6557 | 6560 |
6558 } // namespace content | 6561 } // namespace content |
OLD | NEW |