Chromium Code Reviews| 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 2839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2850 #endif | 2850 #endif |
| 2851 | 2851 |
| 2852 if (!url_index_.get() || url_index_->frame() != frame_) | 2852 if (!url_index_.get() || url_index_->frame() != frame_) |
| 2853 url_index_.reset(new media::UrlIndex(frame_)); | 2853 url_index_.reset(new media::UrlIndex(frame_)); |
| 2854 | 2854 |
| 2855 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( | 2855 media::WebMediaPlayerImpl* media_player = new media::WebMediaPlayerImpl( |
| 2856 frame_, client, encrypted_client, | 2856 frame_, client, encrypted_client, |
| 2857 GetWebMediaPlayerDelegate()->AsWeakPtr(), | 2857 GetWebMediaPlayerDelegate()->AsWeakPtr(), |
| 2858 std::move(media_renderer_factory), url_index_, params); | 2858 std::move(media_renderer_factory), url_index_, params); |
| 2859 | 2859 |
| 2860 | |
| 2861 // TODO(crbug/673886): Re-enable overlays with VR shell enabled when VR | |
|
ddorwin
2016/12/15 01:23:52
crbug.com so it is clickable.
amp
2016/12/15 21:49:02
Done.
| |
| 2862 // shell's video reprojection surface is enabled. | |
| 2863 media_player->SetEnableFullscreenOverlays( | |
|
ddorwin
2016/12/15 01:23:52
This forcibly overrides the current (default) sett
amp
2016/12/15 21:49:02
Ok. I'll pull back out the overlay feature check
| |
| 2864 !base::FeatureList::IsEnabled(features::kVrShell)); | |
| 2865 | |
| 2860 #if defined(OS_ANDROID) // WMPI_CAST | 2866 #if defined(OS_ANDROID) // WMPI_CAST |
| 2861 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); | 2867 media_player->SetMediaPlayerManager(GetMediaPlayerManager()); |
| 2862 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); | 2868 media_player->SetDeviceScaleFactor(render_view_->GetDeviceScaleFactor()); |
| 2863 media_player->SetUseFallbackPath(use_fallback_path); | 2869 media_player->SetUseFallbackPath(use_fallback_path); |
| 2864 #endif // defined(OS_ANDROID) | 2870 #endif // defined(OS_ANDROID) |
| 2865 | 2871 |
| 2866 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2872 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| 2867 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind( | 2873 remoting_controller_ptr->SetSwitchRendererCallback(base::Bind( |
| 2868 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr())); | 2874 &media::WebMediaPlayerImpl::ScheduleRestart, media_player->AsWeakPtr())); |
| 2869 #endif | 2875 #endif |
| (...skipping 3806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6676 // event target. Potentially a Pepper plugin will receive the event. | 6682 // event target. Potentially a Pepper plugin will receive the event. |
| 6677 // In order to tell whether a plugin gets the last mouse event and which it | 6683 // In order to tell whether a plugin gets the last mouse event and which it |
| 6678 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6684 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6679 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6685 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6680 // |pepper_last_mouse_event_target_|. | 6686 // |pepper_last_mouse_event_target_|. |
| 6681 pepper_last_mouse_event_target_ = nullptr; | 6687 pepper_last_mouse_event_target_ = nullptr; |
| 6682 #endif | 6688 #endif |
| 6683 } | 6689 } |
| 6684 | 6690 |
| 6685 } // namespace content | 6691 } // namespace content |
| OLD | NEW |