| 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 2877 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2888 if (!media_renderer_factory) { | 2888 if (!media_renderer_factory) { |
| 2889 media_renderer_factory = base::MakeUnique<media::MojoRendererFactory>( | 2889 media_renderer_factory = base::MakeUnique<media::MojoRendererFactory>( |
| 2890 base::Bind(&RenderThreadImpl::GetGpuFactories, | 2890 base::Bind(&RenderThreadImpl::GetGpuFactories, |
| 2891 base::Unretained(render_thread)), | 2891 base::Unretained(render_thread)), |
| 2892 GetMediaInterfaceProvider()); | 2892 GetMediaInterfaceProvider()); |
| 2893 } | 2893 } |
| 2894 #else | 2894 #else |
| 2895 media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>( | 2895 media_renderer_factory = base::MakeUnique<media::DefaultRendererFactory>( |
| 2896 media_log, GetDecoderFactory(), | 2896 media_log, GetDecoderFactory(), |
| 2897 base::Bind(&RenderThreadImpl::GetGpuFactories, | 2897 base::Bind(&RenderThreadImpl::GetGpuFactories, |
| 2898 base::Unretained(render_thread))); | 2898 base::Unretained(render_thread)), |
| 2899 nullptr); |
| 2899 #endif // defined(ENABLE_MOJO_RENDERER) | 2900 #endif // defined(ENABLE_MOJO_RENDERER) |
| 2900 } | 2901 } |
| 2901 | 2902 |
| 2902 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2903 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| 2903 auto* const remoting_controller_ptr = remoting_controller.get(); | 2904 auto* const remoting_controller_ptr = remoting_controller.get(); |
| 2904 media_renderer_factory = | 2905 media_renderer_factory = |
| 2905 base::MakeUnique<media::remoting::AdaptiveRendererFactory>( | 2906 base::MakeUnique<media::remoting::AdaptiveRendererFactory>( |
| 2906 std::move(media_renderer_factory), std::move(remoting_controller)); | 2907 std::move(media_renderer_factory), std::move(remoting_controller)); |
| 2907 #endif | 2908 #endif |
| 2908 | 2909 |
| (...skipping 3899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6808 // event target. Potentially a Pepper plugin will receive the event. | 6809 // event target. Potentially a Pepper plugin will receive the event. |
| 6809 // In order to tell whether a plugin gets the last mouse event and which it | 6810 // In order to tell whether a plugin gets the last mouse event and which it |
| 6810 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6811 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6811 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6812 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6812 // |pepper_last_mouse_event_target_|. | 6813 // |pepper_last_mouse_event_target_|. |
| 6813 pepper_last_mouse_event_target_ = nullptr; | 6814 pepper_last_mouse_event_target_ = nullptr; |
| 6814 #endif | 6815 #endif |
| 6815 } | 6816 } |
| 6816 | 6817 |
| 6817 } // namespace content | 6818 } // namespace content |
| OLD | NEW |