diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 12:15:17 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 12:15:17 +0000 |
| commit | 7198402cf45cf1f5d18b80d2d85131f4391dfca8 (patch) | |
| tree | 9a532eff2b6fb891debb76463d78b5851a2bb611 /content | |
| parent | cff5dadeb1be4c526a1b3875c9acf422cbaf834d (diff) | |
| download | chromium_src-7198402cf45cf1f5d18b80d2d85131f4391dfca8.zip chromium_src-7198402cf45cf1f5d18b80d2d85131f4391dfca8.tar.gz chromium_src-7198402cf45cf1f5d18b80d2d85131f4391dfca8.tar.bz2 | |
Changes to cancel prerendering when there is HTML5 audio/video on a page.
BUG=76599
TEST=browser tests added.
Review URL: http://codereview.chromium.org/6690027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/render_view.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc index b199f4c..a6c559f 100644 --- a/content/renderer/render_view.cc +++ b/content/renderer/render_view.cc @@ -2486,6 +2486,12 @@ WebSharedWorker* RenderView::createSharedWorker( WebMediaPlayer* RenderView::createMediaPlayer( WebFrame* frame, WebMediaPlayerClient* client) { + // If this is a prerendering page, start the cancel of the prerender. + if (is_prerendering_) { + Send(new ViewHostMsg_MaybeCancelPrerender(routing_id_, + prerender::PRERENDER_CANCELLATION_REASON_HTML5_MEDIA)); + } + scoped_ptr<media::MessageLoopFactory> message_loop_factory( new media::MessageLoopFactoryImpl()); scoped_ptr<media::FilterCollection> collection( |