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

Unified Diff: chrome/renderer/render_view.cc

Issue 5469001: Merge 67824 - Stopgap fix for crash in issue 53867 comment 15... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/597/src/
Patch Set: Created 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/base/pipeline_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc (revision 67852)
+++ chrome/renderer/render_view.cc (working copy)
@@ -2847,10 +2847,15 @@
collection->AddVideoRenderer(renderer);
video_renderer = renderer;
- return new webkit_glue::WebMediaPlayerImpl(
- client, collection.release(), bridge_factory_simple,
- bridge_factory_buffered,
- cmd_line->HasSwitch(switches::kSimpleDataSource),video_renderer);
+ scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
+ new webkit_glue::WebMediaPlayerImpl(client, collection.release()));
+ if (!result->Initialize(bridge_factory_simple,
+ bridge_factory_buffered,
+ cmd_line->HasSwitch(switches::kSimpleDataSource),
+ video_renderer)) {
+ return NULL;
+ }
+ return result.release();
}
WebApplicationCacheHost* RenderView::createApplicationCacheHost(
« no previous file with comments | « no previous file | media/base/pipeline_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698