OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <cmath> | 8 #include <cmath> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2694 } | 2694 } |
2695 } | 2695 } |
2696 | 2696 |
2697 WebMediaPlayer* RenderViewImpl::createMediaPlayer( | 2697 WebMediaPlayer* RenderViewImpl::createMediaPlayer( |
2698 WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) { | 2698 WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) { |
2699 FOR_EACH_OBSERVER( | 2699 FOR_EACH_OBSERVER( |
2700 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); | 2700 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); |
2701 | 2701 |
2702 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 2702 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
2703 #if defined(ENABLE_WEBRTC) | 2703 #if defined(ENABLE_WEBRTC) |
2704 // TODO(wjia): when all patches related to WebMediaPlayerMS have been | 2704 if (MediaStreamImpl::CheckMediaStream(url)) { |
2705 // landed, remove the switch. Refer to crbug.com/142988. | |
2706 if (!cmd_line->HasSwitch(switches::kDisableWebMediaPlayerMS) && | |
2707 MediaStreamImpl::CheckMediaStream(url)) { | |
2708 EnsureMediaStreamImpl(); | 2705 EnsureMediaStreamImpl(); |
2709 return new webkit_media::WebMediaPlayerMS( | 2706 return new webkit_media::WebMediaPlayerMS( |
2710 frame, client, AsWeakPtr(), media_stream_impl_, new RenderMediaLog()); | 2707 frame, client, AsWeakPtr(), media_stream_impl_, new RenderMediaLog()); |
2711 } | 2708 } |
2712 #endif | 2709 #endif |
2713 | 2710 |
2714 #if defined(OS_ANDROID) | 2711 #if defined(OS_ANDROID) |
2715 WebGraphicsContext3D* resource_context = | 2712 WebGraphicsContext3D* resource_context = |
2716 GetWebView()->sharedGraphicsContext3D(); | 2713 GetWebView()->sharedGraphicsContext3D(); |
2717 | 2714 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2780 ->message_loop()->message_loop_proxy() : | 2777 ->message_loop()->message_loop_proxy() : |
2781 base::MessageLoopProxy::current(); | 2778 base::MessageLoopProxy::current(); |
2782 GpuChannelHost* gpu_channel_host = | 2779 GpuChannelHost* gpu_channel_host = |
2783 RenderThreadImpl::current()->EstablishGpuChannelSync( | 2780 RenderThreadImpl::current()->EstablishGpuChannelSync( |
2784 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); | 2781 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); |
2785 gpu_factories = new RendererGpuVideoDecoderFactories( | 2782 gpu_factories = new RendererGpuVideoDecoderFactories( |
2786 gpu_channel_host, factories_loop, context3d); | 2783 gpu_channel_host, factories_loop, context3d); |
2787 } | 2784 } |
2788 | 2785 |
2789 webkit_media::WebMediaPlayerParams params( | 2786 webkit_media::WebMediaPlayerParams params( |
2790 sink, gpu_factories, media_stream_impl_, new RenderMediaLog()); | 2787 sink, gpu_factories, new RenderMediaLog()); |
2791 WebMediaPlayer* media_player = | 2788 WebMediaPlayer* media_player = |
2792 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( | 2789 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( |
2793 this, frame, client, AsWeakPtr(), params); | 2790 this, frame, client, AsWeakPtr(), params); |
2794 if (!media_player) { | 2791 if (!media_player) { |
2795 media_player = new webkit_media::WebMediaPlayerImpl( | 2792 media_player = new webkit_media::WebMediaPlayerImpl( |
2796 frame, client, AsWeakPtr(), params); | 2793 frame, client, AsWeakPtr(), params); |
2797 } | 2794 } |
2798 return media_player; | 2795 return media_player; |
2799 } | 2796 } |
2800 | 2797 |
(...skipping 3903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6704 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); | 6701 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); |
6705 RenderProcess::current()->ReleaseTransportDIB(dib); | 6702 RenderProcess::current()->ReleaseTransportDIB(dib); |
6706 } | 6703 } |
6707 | 6704 |
6708 void RenderViewImpl::DidCommitCompositorFrame() { | 6705 void RenderViewImpl::DidCommitCompositorFrame() { |
6709 RenderWidget::DidCommitCompositorFrame(); | 6706 RenderWidget::DidCommitCompositorFrame(); |
6710 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); | 6707 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); |
6711 } | 6708 } |
6712 | 6709 |
6713 } // namespace content | 6710 } // namespace content |
OLD | NEW |