| 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 6010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6021 RenderThreadImpl* const render_thread = RenderThreadImpl::current(); | 6021 RenderThreadImpl* const render_thread = RenderThreadImpl::current(); |
| 6022 | 6022 |
| 6023 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = | 6023 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = |
| 6024 render_thread->compositor_task_runner(); | 6024 render_thread->compositor_task_runner(); |
| 6025 if (!compositor_task_runner.get()) | 6025 if (!compositor_task_runner.get()) |
| 6026 compositor_task_runner = base::ThreadTaskRunnerHandle::Get(); | 6026 compositor_task_runner = base::ThreadTaskRunnerHandle::Get(); |
| 6027 | 6027 |
| 6028 return new WebMediaPlayerMS( | 6028 return new WebMediaPlayerMS( |
| 6029 frame_, client, GetWebMediaPlayerDelegate()->AsWeakPtr(), | 6029 frame_, client, GetWebMediaPlayerDelegate()->AsWeakPtr(), |
| 6030 new RenderMediaLog(url::Origin(security_origin).GetURL()), | 6030 new RenderMediaLog(url::Origin(security_origin).GetURL()), |
| 6031 CreateRendererFactory(), compositor_task_runner, | 6031 CreateRendererFactory(), render_thread->GetIOTaskRunner(), |
| 6032 render_thread->GetMediaThreadTaskRunner(), | 6032 compositor_task_runner, render_thread->GetMediaThreadTaskRunner(), |
| 6033 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories(), | 6033 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories(), |
| 6034 sink_id, security_origin); | 6034 sink_id, security_origin); |
| 6035 #else | 6035 #else |
| 6036 return NULL; | 6036 return NULL; |
| 6037 #endif // BUILDFLAG(ENABLE_WEBRTC) | 6037 #endif // BUILDFLAG(ENABLE_WEBRTC) |
| 6038 } | 6038 } |
| 6039 | 6039 |
| 6040 std::unique_ptr<MediaStreamRendererFactory> | 6040 std::unique_ptr<MediaStreamRendererFactory> |
| 6041 RenderFrameImpl::CreateRendererFactory() { | 6041 RenderFrameImpl::CreateRendererFactory() { |
| 6042 std::unique_ptr<MediaStreamRendererFactory> factory = | 6042 std::unique_ptr<MediaStreamRendererFactory> factory = |
| (...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6671 // event target. Potentially a Pepper plugin will receive the event. | 6671 // event target. Potentially a Pepper plugin will receive the event. |
| 6672 // In order to tell whether a plugin gets the last mouse event and which it | 6672 // In order to tell whether a plugin gets the last mouse event and which it |
| 6673 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6673 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6674 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6674 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6675 // |pepper_last_mouse_event_target_|. | 6675 // |pepper_last_mouse_event_target_|. |
| 6676 pepper_last_mouse_event_target_ = nullptr; | 6676 pepper_last_mouse_event_target_ = nullptr; |
| 6677 #endif | 6677 #endif |
| 6678 } | 6678 } |
| 6679 | 6679 |
| 6680 } // namespace content | 6680 } // namespace content |
| OLD | NEW |