OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 1892 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1903 scoped_ptr<media::FilterCollection> collection( | 1903 scoped_ptr<media::FilterCollection> collection( |
1904 new media::FilterCollection()); | 1904 new media::FilterCollection()); |
1905 | 1905 |
1906 // Add in any custom filter factories first. | 1906 // Add in any custom filter factories first. |
1907 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 1907 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
1908 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 1908 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
1909 // Add the chrome specific audio renderer. | 1909 // Add the chrome specific audio renderer. |
1910 collection->AddAudioRenderer(new AudioRendererImpl()); | 1910 collection->AddAudioRenderer(new AudioRendererImpl()); |
1911 } | 1911 } |
1912 | 1912 |
1913 scoped_refptr<webkit_media::WebVideoRenderer> video_renderer; | |
1914 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); | |
1915 scoped_refptr<webkit_media::VideoRendererImpl> renderer( | |
1916 new webkit_media::VideoRendererImpl(pts_logging)); | |
1917 collection->AddVideoRenderer(renderer); | |
1918 video_renderer = renderer; | |
1919 | |
1920 scoped_ptr<webkit_media::WebMediaPlayerImpl> result( | 1913 scoped_ptr<webkit_media::WebMediaPlayerImpl> result( |
1921 new webkit_media::WebMediaPlayerImpl(client, | 1914 new webkit_media::WebMediaPlayerImpl(client, |
1922 AsWeakPtr(), | 1915 AsWeakPtr(), |
1923 collection.release(), | 1916 collection.release(), |
1924 message_loop_factory.release(), | 1917 message_loop_factory.release(), |
1925 media_stream_impl_.get(), | 1918 media_stream_impl_.get(), |
1926 new RenderMediaLog())); | 1919 new RenderMediaLog())); |
1927 if (!result->Initialize(frame, | 1920 if (!result->Initialize(frame, |
1928 cmd_line->HasSwitch(switches::kSimpleDataSource), | 1921 cmd_line->HasSwitch(switches::kSimpleDataSource))) { |
1929 video_renderer)) { | |
1930 return NULL; | 1922 return NULL; |
1931 } | 1923 } |
1932 return result.release(); | 1924 return result.release(); |
1933 } | 1925 } |
1934 | 1926 |
1935 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost( | 1927 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost( |
1936 WebFrame* frame, WebApplicationCacheHostClient* client) { | 1928 WebFrame* frame, WebApplicationCacheHostClient* client) { |
1937 return new RendererWebApplicationCacheHostImpl( | 1929 return new RendererWebApplicationCacheHostImpl( |
1938 FromWebView(frame->view()), client, | 1930 FromWebView(frame->view()), client, |
1939 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); | 1931 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); |
(...skipping 2793 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4733 return webview()->settings()->useThreadedCompositor(); | 4725 return webview()->settings()->useThreadedCompositor(); |
4734 } | 4726 } |
4735 | 4727 |
4736 void RenderViewImpl::OnJavaBridgeInit( | 4728 void RenderViewImpl::OnJavaBridgeInit( |
4737 const IPC::ChannelHandle& channel_handle) { | 4729 const IPC::ChannelHandle& channel_handle) { |
4738 DCHECK(!java_bridge_dispatcher_.get()); | 4730 DCHECK(!java_bridge_dispatcher_.get()); |
4739 #if defined(ENABLE_JAVA_BRIDGE) | 4731 #if defined(ENABLE_JAVA_BRIDGE) |
4740 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); | 4732 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); |
4741 #endif | 4733 #endif |
4742 } | 4734 } |
OLD | NEW |