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

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: Addressing Dominic's comments. 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 1924 matching lines...) Expand 10 before | Expand all | Expand 10 after
1935 collection->AddAudioRenderer(new AudioRendererImpl()); 1935 collection->AddAudioRenderer(new AudioRendererImpl());
1936 } 1936 }
1937 1937
1938 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; 1938 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer;
1939 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); 1939 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
1940 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( 1940 scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
1941 new webkit_glue::VideoRendererImpl(pts_logging)); 1941 new webkit_glue::VideoRendererImpl(pts_logging));
1942 collection->AddVideoRenderer(renderer); 1942 collection->AddVideoRenderer(renderer);
1943 video_renderer = renderer; 1943 video_renderer = renderer;
1944 1944
1945 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( 1945 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result;
1946 new webkit_glue::WebMediaPlayerImpl(client, 1946 if (content::GetContentClient()->renderer()
1947 AsWeakPtr(), 1947 ->ShouldOverrideCreateWebMediaPlayer(this)) {
1948 collection.release(), 1948 webkit_glue::WebMediaPlayerImpl* result_ptr;
1949 message_loop_factory.release(), 1949 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
1950 media_stream_impl_.get(), 1950 this, client, AsWeakPtr(), collection.release(),
1951 new RenderMediaLog())); 1951 message_loop_factory.release(), media_stream_impl_.get(),
1952 new RenderMediaLog(), &result_ptr);
1953 DCHECK(result_ptr);
1954 result.reset(result_ptr);
1955 } else {
1956 result.reset(new webkit_glue::WebMediaPlayerImpl(client, AsWeakPtr(),
1957 collection.release(), message_loop_factory.release(),
1958 media_stream_impl_.get(), new RenderMediaLog()));
1959 }
1960 DCHECK(result.get());
1961
1952 if (!result->Initialize(frame, 1962 if (!result->Initialize(frame,
1953 cmd_line->HasSwitch(switches::kSimpleDataSource), 1963 cmd_line->HasSwitch(switches::kSimpleDataSource),
1954 video_renderer)) { 1964 video_renderer)) {
1955 return NULL; 1965 return NULL;
1956 } 1966 }
1957 return result.release(); 1967 return result.release();
1958 } 1968 }
1959 1969
1960 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost( 1970 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(
1961 WebFrame* frame, WebApplicationCacheHostClient* client) { 1971 WebFrame* frame, WebApplicationCacheHostClient* client) {
(...skipping 2742 matching lines...) Expand 10 before | Expand all | Expand 10 after
4704 return webview()->settings()->useThreadedCompositor(); 4714 return webview()->settings()->useThreadedCompositor();
4705 } 4715 }
4706 4716
4707 void RenderViewImpl::OnJavaBridgeInit( 4717 void RenderViewImpl::OnJavaBridgeInit(
4708 const IPC::ChannelHandle& channel_handle) { 4718 const IPC::ChannelHandle& channel_handle) {
4709 DCHECK(!java_bridge_dispatcher_.get()); 4719 DCHECK(!java_bridge_dispatcher_.get());
4710 #if defined(ENABLE_JAVA_BRIDGE) 4720 #if defined(ENABLE_JAVA_BRIDGE)
4711 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); 4721 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle));
4712 #endif 4722 #endif
4713 } 4723 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698