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 2794 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2805 } | 2805 } |
| 2806 #endif // defined(OS_ANDROID) | 2806 #endif // defined(OS_ANDROID) |
| 2807 | 2807 |
| 2808 std::unique_ptr<media::RendererFactory> media_renderer_factory; | 2808 std::unique_ptr<media::RendererFactory> media_renderer_factory; |
| 2809 if (use_fallback_path) { | 2809 if (use_fallback_path) { |
| 2810 #if defined(OS_ANDROID) | 2810 #if defined(OS_ANDROID) |
| 2811 auto mojo_renderer_factory = base::MakeUnique<media::MojoRendererFactory>( | 2811 auto mojo_renderer_factory = base::MakeUnique<media::MojoRendererFactory>( |
| 2812 media::MojoRendererFactory::GetGpuFactoriesCB(), | 2812 media::MojoRendererFactory::GetGpuFactoriesCB(), |
| 2813 GetRemoteInterfaces()->get()); | 2813 GetRemoteInterfaces()->get()); |
| 2814 | 2814 |
| 2815 bool enable_texture_copy = | |
|
DaleCurtis
2016/11/07 22:37:50
Generally just inline if there's only one user. Us
tguilbert
2016/11/07 23:25:01
Done and done.
| |
| 2816 RenderThreadImpl::current()->EnableStreamTextureCopy(); | |
| 2817 | |
| 2815 media_renderer_factory = base::MakeUnique<MediaPlayerRendererClientFactory>( | 2818 media_renderer_factory = base::MakeUnique<MediaPlayerRendererClientFactory>( |
| 2816 render_thread->compositor_task_runner(), | 2819 render_thread->compositor_task_runner(), |
| 2817 std::move(mojo_renderer_factory), | 2820 std::move(mojo_renderer_factory), |
| 2818 base::Bind(&StreamTextureWrapperImpl::Create, | 2821 base::Bind(&StreamTextureWrapperImpl::Create, enable_texture_copy, |
| 2819 render_thread->GetStreamTexureFactory(), | 2822 render_thread->GetStreamTexureFactory(), |
| 2820 base::ThreadTaskRunnerHandle::Get())); | 2823 base::ThreadTaskRunnerHandle::Get())); |
| 2821 #endif // defined(OS_ANDROID) | 2824 #endif // defined(OS_ANDROID) |
| 2822 } else { | 2825 } else { |
| 2823 #if defined(ENABLE_MOJO_RENDERER) | 2826 #if defined(ENABLE_MOJO_RENDERER) |
| 2824 media_renderer_factory = base::MakeUnique<media::MojoRendererFactory>( | 2827 media_renderer_factory = base::MakeUnique<media::MojoRendererFactory>( |
| 2825 base::Bind(&RenderThreadImpl::GetGpuFactories, | 2828 base::Bind(&RenderThreadImpl::GetGpuFactories, |
| 2826 base::Unretained(render_thread)), | 2829 base::Unretained(render_thread)), |
| 2827 GetMediaInterfaceProvider()); | 2830 GetMediaInterfaceProvider()); |
| 2828 #else | 2831 #else |
| (...skipping 3755 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6584 // event target. Potentially a Pepper plugin will receive the event. | 6587 // event target. Potentially a Pepper plugin will receive the event. |
| 6585 // In order to tell whether a plugin gets the last mouse event and which it | 6588 // In order to tell whether a plugin gets the last mouse event and which it |
| 6586 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6589 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6587 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6590 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6588 // |pepper_last_mouse_event_target_|. | 6591 // |pepper_last_mouse_event_target_|. |
| 6589 pepper_last_mouse_event_target_ = nullptr; | 6592 pepper_last_mouse_event_target_ = nullptr; |
| 6590 #endif | 6593 #endif |
| 6591 } | 6594 } |
| 6592 | 6595 |
| 6593 } // namespace content | 6596 } // namespace content |
| OLD | NEW |