Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 8095007: Defer loading of audio/video tags while prerendering. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Adding "+webkit/media" to chrome/renderer/DEFS. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1893 matching lines...) Expand 10 before | Expand all | Expand 10 after
1904 scoped_ptr<media::FilterCollection> collection( 1904 scoped_ptr<media::FilterCollection> collection(
1905 new media::FilterCollection()); 1905 new media::FilterCollection());
1906 1906
1907 // Add in any custom filter factories first. 1907 // Add in any custom filter factories first.
1908 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 1908 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
1909 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { 1909 if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
1910 // Add the chrome specific audio renderer. 1910 // Add the chrome specific audio renderer.
1911 collection->AddAudioRenderer(new AudioRendererImpl()); 1911 collection->AddAudioRenderer(new AudioRendererImpl());
1912 } 1912 }
1913 1913
1914 scoped_ptr<webkit_media::WebMediaPlayerImpl> result( 1914 scoped_ptr<webkit_media::WebMediaPlayerImpl> result;
1915 new webkit_media::WebMediaPlayerImpl(client, 1915 if (content::GetContentClient()->renderer()
1916 AsWeakPtr(), 1916 ->ShouldOverrideCreateWebMediaPlayer(this)) {
1917 collection.release(), 1917 webkit_media::WebMediaPlayerImpl* result_ptr;
1918 message_loop_factory.release(), 1918 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
1919 media_stream_impl_.get(), 1919 this, client, AsWeakPtr(), collection.release(),
1920 new RenderMediaLog())); 1920 message_loop_factory.release(), media_stream_impl_.get(),
1921 new RenderMediaLog(), &result_ptr);
1922 DCHECK(result_ptr);
1923 result.reset(result_ptr);
1924 } else {
1925 result.reset(new webkit_media::WebMediaPlayerImpl(client, AsWeakPtr(),
1926 collection.release(), message_loop_factory.release(),
1927 media_stream_impl_.get(), new RenderMediaLog()));
1928 }
1929 DCHECK(result.get());
1930
1921 if (!result->Initialize(frame, 1931 if (!result->Initialize(frame,
1922 cmd_line->HasSwitch(switches::kSimpleDataSource))) { 1932 cmd_line->HasSwitch(switches::kSimpleDataSource))) {
1923 return NULL; 1933 return NULL;
1924 } 1934 }
1925 return result.release(); 1935 return result.release();
1926 } 1936 }
1927 1937
1928 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost( 1938 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(
1929 WebFrame* frame, WebApplicationCacheHostClient* client) { 1939 WebFrame* frame, WebApplicationCacheHostClient* client) {
1930 return new RendererWebApplicationCacheHostImpl( 1940 return new RendererWebApplicationCacheHostImpl(
(...skipping 2797 matching lines...) Expand 10 before | Expand all | Expand 10 after
4728 return !!RenderThreadImpl::current()->compositor_thread(); 4738 return !!RenderThreadImpl::current()->compositor_thread();
4729 } 4739 }
4730 4740
4731 void RenderViewImpl::OnJavaBridgeInit( 4741 void RenderViewImpl::OnJavaBridgeInit(
4732 const IPC::ChannelHandle& channel_handle) { 4742 const IPC::ChannelHandle& channel_handle) {
4733 DCHECK(!java_bridge_dispatcher_.get()); 4743 DCHECK(!java_bridge_dispatcher_.get());
4734 #if defined(ENABLE_JAVA_BRIDGE) 4744 #if defined(ENABLE_JAVA_BRIDGE)
4735 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); 4745 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
4736 #endif 4746 #endif
4737 } 4747 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698