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 2842 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2853 #endif | 2853 #endif |
2854 | 2854 |
2855 if (!url_index_.get() || url_index_->frame() != frame_) | 2855 if (!url_index_.get() || url_index_->frame() != frame_) |
2856 url_index_.reset(new media::UrlIndex(frame_)); | 2856 url_index_.reset(new media::UrlIndex(frame_)); |
2857 | 2857 |
2858 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( | 2858 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
2859 frame_, client, encrypted_client, | 2859 frame_, client, encrypted_client, |
2860 GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2860 GetWebMediaPlayerDelegate()->AsWeakPtr(), |
2861 std::move(media_renderer_factory), url_index_, params); | 2861 std::move(media_renderer_factory), url_index_, params); |
2862 | 2862 |
2863 // TODO(crbug/673886): Enable overlays for VR shell when video reprojection | |
mthiesse
2016/12/14 16:08:19
For clarity, how about: Re-enable overlays with VR
amp
2016/12/14 18:15:04
Sounds good. I was trying to find a good way to wo
liberato (no reviews please)
2016/12/14 19:39:06
please also include in the TODO (or the bug) to mo
amp
2016/12/14 22:02:09
I moved the kOverlayFullscreenVideo back into the
| |
2864 // surface is enabled. | |
2865 media_player->SetEnableFullscreenOverlays( | |
2866 base::FeatureList::IsEnabled(media::kOverlayFullscreenVideo) && | |
2867 !base::FeatureList::IsEnabled(features::kVrShell)); | |
2868 | |
2863 #if defined(OS_ANDROID) // WMPI_CAST | 2869 #if defined(OS_ANDROID) // WMPI_CAST |
2864 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); | 2870 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); |
2865 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); | 2871 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); |
2866 media_player->SetUseFallbackPath(use_fallback_path); | 2872 media_player->SetUseFallbackPath(use_fallback_path); |
2867 #endif // defined(OS_ANDROID) | 2873 #endif // defined(OS_ANDROID) |
2868 | 2874 |
2869 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2875 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
2870 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind( | 2876 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind( |
2871 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr())); | 2877 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr())); |
2872 #endif | 2878 #endif |
(...skipping 3808 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6681 // event target. Potentially a Pepper plugin will receive the event. | 6687 // event target. Potentially a Pepper plugin will receive the event. |
6682 // In order to tell whether a plugin gets the last mouse event and which it | 6688 // In order to tell whether a plugin gets the last mouse event and which it |
6683 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6689 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
6684 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6690 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
6685 // |pepper_last_mouse_event_target_|. | 6691 // |pepper_last_mouse_event_target_|. |
6686 pepper_last_mouse_event_target_ = nullptr; | 6692 pepper_last_mouse_event_target_ = nullptr; |
6687 #endif | 6693 #endif |
6688 } | 6694 } |
6689 | 6695 |
6690 } // namespace content | 6696 } // namespace content |
OLD | NEW |