| 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 2802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2813 // We need to keep a reference to the context provider (see crbug.com/610527) | 2813 // We need to keep a reference to the context provider (see crbug.com/610527) |
| 2814 // but media/ can't depend on cc/, so for now, just keep a reference in the | 2814 // but media/ can't depend on cc/, so for now, just keep a reference in the |
| 2815 // callback. | 2815 // callback. |
| 2816 // TODO(piman): replace media::Context3D to scoped_refptr<ContextProvider> in | 2816 // TODO(piman): replace media::Context3D to scoped_refptr<ContextProvider> in |
| 2817 // media/ once ContextProvider is in gpu/. | 2817 // media/ once ContextProvider is in gpu/. |
| 2818 media::WebMediaPlayerParams::Context3DCB context_3d_cb = base::Bind( | 2818 media::WebMediaPlayerParams::Context3DCB context_3d_cb = base::Bind( |
| 2819 &GetSharedMainThreadContext3D, | 2819 &GetSharedMainThreadContext3D, |
| 2820 RenderThreadImpl::current()->SharedMainThreadContextProvider()); | 2820 RenderThreadImpl::current()->SharedMainThreadContextProvider()); |
| 2821 | 2821 |
| 2822 scoped_refptr<media::MediaLog> media_log( | 2822 scoped_refptr<media::MediaLog> media_log( |
| 2823 new RenderMediaLog(url::Origin(frame_->getSecurityOrigin()).GetURL())); | 2823 new RenderMediaLog(url::Origin(frame_->getSecurityOrigin()).GetURL(), |
| 2824 frame_->timerTaskRunner())); |
| 2824 | 2825 |
| 2825 #if defined(OS_ANDROID) | 2826 #if defined(OS_ANDROID) |
| 2826 if (UseWebMediaPlayerImpl(url) && !media_surface_manager_) | 2827 if (UseWebMediaPlayerImpl(url) && !media_surface_manager_) |
| 2827 media_surface_manager_ = new RendererSurfaceViewManager(this); | 2828 media_surface_manager_ = new RendererSurfaceViewManager(this); |
| 2828 #endif // defined(OS_ANDROID) | 2829 #endif // defined(OS_ANDROID) |
| 2829 | 2830 |
| 2830 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) | 2831 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) |
| 2831 media::mojom::RemotingSourcePtr remoting_source; | 2832 media::mojom::RemotingSourcePtr remoting_source; |
| 2832 media::mojom::RemotingSourceRequest remoting_source_request(&remoting_source); | 2833 media::mojom::RemotingSourceRequest remoting_source_request(&remoting_source); |
| 2833 media::mojom::RemoterPtr remoter; | 2834 media::mojom::RemoterPtr remoter; |
| (...skipping 3299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6133 #if BUILDFLAG(ENABLE_WEBRTC) | 6134 #if BUILDFLAG(ENABLE_WEBRTC) |
| 6134 RenderThreadImpl* const render_thread = RenderThreadImpl::current(); | 6135 RenderThreadImpl* const render_thread = RenderThreadImpl::current(); |
| 6135 | 6136 |
| 6136 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = | 6137 scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner = |
| 6137 render_thread->compositor_task_runner(); | 6138 render_thread->compositor_task_runner(); |
| 6138 if (!compositor_task_runner.get()) | 6139 if (!compositor_task_runner.get()) |
| 6139 compositor_task_runner = base::ThreadTaskRunnerHandle::Get(); | 6140 compositor_task_runner = base::ThreadTaskRunnerHandle::Get(); |
| 6140 | 6141 |
| 6141 return new WebMediaPlayerMS( | 6142 return new WebMediaPlayerMS( |
| 6142 frame_, client, GetWebMediaPlayerDelegate(), | 6143 frame_, client, GetWebMediaPlayerDelegate(), |
| 6143 new RenderMediaLog(url::Origin(security_origin).GetURL()), | 6144 new RenderMediaLog(url::Origin(security_origin).GetURL(), |
| 6145 frame_->timerTaskRunner()), |
| 6144 CreateRendererFactory(), render_thread->GetIOTaskRunner(), | 6146 CreateRendererFactory(), render_thread->GetIOTaskRunner(), |
| 6145 compositor_task_runner, render_thread->GetMediaThreadTaskRunner(), | 6147 compositor_task_runner, render_thread->GetMediaThreadTaskRunner(), |
| 6146 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories(), | 6148 render_thread->GetWorkerTaskRunner(), render_thread->GetGpuFactories(), |
| 6147 sink_id, security_origin); | 6149 sink_id, security_origin); |
| 6148 #else | 6150 #else |
| 6149 return NULL; | 6151 return NULL; |
| 6150 #endif // BUILDFLAG(ENABLE_WEBRTC) | 6152 #endif // BUILDFLAG(ENABLE_WEBRTC) |
| 6151 } | 6153 } |
| 6152 | 6154 |
| 6153 std::unique_ptr<MediaStreamRendererFactory> | 6155 std::unique_ptr<MediaStreamRendererFactory> |
| (...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6815 // event target. Potentially a Pepper plugin will receive the event. | 6817 // event target. Potentially a Pepper plugin will receive the event. |
| 6816 // In order to tell whether a plugin gets the last mouse event and which it | 6818 // In order to tell whether a plugin gets the last mouse event and which it |
| 6817 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets | 6819 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets |
| 6818 // the event, it will notify us via DidReceiveMouseEvent() and set itself as | 6820 // the event, it will notify us via DidReceiveMouseEvent() and set itself as |
| 6819 // |pepper_last_mouse_event_target_|. | 6821 // |pepper_last_mouse_event_target_|. |
| 6820 pepper_last_mouse_event_target_ = nullptr; | 6822 pepper_last_mouse_event_target_ = nullptr; |
| 6821 #endif | 6823 #endif |
| 6822 } | 6824 } |
| 6823 | 6825 |
| 6824 } // namespace content | 6826 } // namespace content |
| OLD | NEW |