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

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 more tests and addressing all comments. Created 9 years, 2 months 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 1927 matching lines...) Expand 10 before | Expand all | Expand 10 after
1938 collection->AddAudioRenderer(new AudioRendererImpl()); 1938 collection->AddAudioRenderer(new AudioRendererImpl());
1939 } 1939 }
1940 1940
1941 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; 1941 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer;
1942 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); 1942 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
1943 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( 1943 scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
1944 new webkit_glue::VideoRendererImpl(pts_logging)); 1944 new webkit_glue::VideoRendererImpl(pts_logging));
1945 collection->AddVideoRenderer(renderer); 1945 collection->AddVideoRenderer(renderer);
1946 video_renderer = renderer; 1946 video_renderer = renderer;
1947 1947
1948 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( 1948 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result;
1949 new webkit_glue::WebMediaPlayerImpl(client, 1949 if (content::GetContentClient()->renderer()
1950 collection.release(), 1950 ->ShouldOverrideCreateWebMediaPlayer(this)) {
1951 message_loop_factory.release(), 1951 webkit_glue::WebMediaPlayerImpl* result_ptr;
1952 media_stream_impl_.get(), 1952 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
1953 new RenderMediaLog())); 1953 this, client, collection.release(), message_loop_factory.release(),
1954 media_stream_impl_.get(), new RenderMediaLog(), &result_ptr);
1955 DCHECK(result_ptr);
1956 result.reset(result_ptr);
1957 } else {
1958 result.reset(new webkit_glue::WebMediaPlayerImpl(client,
1959 collection.release(), message_loop_factory.release(),
1960 media_stream_impl_.get(), new RenderMediaLog()));
1961 }
1962
1954 if (!result->Initialize(frame, 1963 if (!result->Initialize(frame,
1955 cmd_line->HasSwitch(switches::kSimpleDataSource), 1964 cmd_line->HasSwitch(switches::kSimpleDataSource),
1956 video_renderer)) { 1965 video_renderer)) {
1957 return NULL; 1966 return NULL;
1958 } 1967 }
1959 return result.release(); 1968 return result.release();
1960 } 1969 }
1961 1970
1962 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost( 1971 WebApplicationCacheHost* RenderViewImpl::createApplicationCacheHost(
1963 WebFrame* frame, WebApplicationCacheHostClient* client) { 1972 WebFrame* frame, WebApplicationCacheHostClient* client) {
(...skipping 2655 matching lines...) Expand 10 before | Expand all | Expand 10 after
4619 pepper_delegate_.OnLockMouseACK(succeeded); 4628 pepper_delegate_.OnLockMouseACK(succeeded);
4620 } 4629 }
4621 4630
4622 void RenderViewImpl::OnMouseLockLost() { 4631 void RenderViewImpl::OnMouseLockLost() {
4623 pepper_delegate_.OnMouseLockLost(); 4632 pepper_delegate_.OnMouseLockLost();
4624 } 4633 }
4625 4634
4626 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 4635 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
4627 return webview()->settings()->useThreadedCompositor(); 4636 return webview()->settings()->useThreadedCompositor();
4628 } 4637 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698