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

Side by Side Diff: content/renderer/render_view.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 Andrew's 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.h" 5 #include "content/renderer/render_view.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 1899 matching lines...) Expand 10 before | Expand all | Expand 10 after
1910 collection->AddAudioRenderer(new AudioRendererImpl()); 1910 collection->AddAudioRenderer(new AudioRendererImpl());
1911 } 1911 }
1912 1912
1913 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer; 1913 scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer;
1914 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging); 1914 bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
1915 scoped_refptr<webkit_glue::VideoRendererImpl> renderer( 1915 scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
1916 new webkit_glue::VideoRendererImpl(pts_logging)); 1916 new webkit_glue::VideoRendererImpl(pts_logging));
1917 collection->AddVideoRenderer(renderer); 1917 collection->AddVideoRenderer(renderer);
1918 video_renderer = renderer; 1918 video_renderer = renderer;
1919 1919
1920 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( 1920 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result;
1921 new webkit_glue::WebMediaPlayerImpl(client, 1921 if (content::GetContentClient()->renderer()
1922 collection.release(), 1922 ->ShouldOverrideCreateWebMediaPlayer(this)) {
1923 message_loop_factory.release(), 1923 webkit_glue::WebMediaPlayerImpl* result_ptr;
1924 media_stream_impl_.get(), 1924 content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
1925 new RenderMediaLog())); 1925 this, client, collection.release(), message_loop_factory.release(),
1926 media_stream_impl_.get(), new RenderMediaLog(), &result_ptr);
1927 DCHECK(result_ptr);
1928 result.reset(result_ptr);
1929 } else {
1930 result.reset(new webkit_glue::WebMediaPlayerImpl(client,
1931 collection.release(), message_loop_factory.release(),
1932 media_stream_impl_.get(), new RenderMediaLog()));
1933 }
1934
1926 if (!result->Initialize(frame, 1935 if (!result->Initialize(frame,
1927 cmd_line->HasSwitch(switches::kSimpleDataSource), 1936 cmd_line->HasSwitch(switches::kSimpleDataSource),
1928 video_renderer)) { 1937 video_renderer)) {
1929 return NULL; 1938 return NULL;
1930 } 1939 }
1931 return result.release(); 1940 return result.release();
1932 } 1941 }
1933 1942
1934 WebApplicationCacheHost* RenderView::createApplicationCacheHost( 1943 WebApplicationCacheHost* RenderView::createApplicationCacheHost(
1935 WebFrame* frame, WebApplicationCacheHostClient* client) { 1944 WebFrame* frame, WebApplicationCacheHostClient* client) {
(...skipping 2521 matching lines...) Expand 10 before | Expand all | Expand 10 after
4457 } 4466 }
4458 4467
4459 void RenderView::OnLockMouseACK(bool succeeded) { 4468 void RenderView::OnLockMouseACK(bool succeeded) {
4460 pepper_delegate_.OnLockMouseACK(succeeded); 4469 pepper_delegate_.OnLockMouseACK(succeeded);
4461 } 4470 }
4462 4471
4463 void RenderView::OnMouseLockLost() { 4472 void RenderView::OnMouseLockLost() {
4464 pepper_delegate_.OnMouseLockLost(); 4473 pepper_delegate_.OnMouseLockLost();
4465 } 4474 }
4466 4475
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698