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

Unified Diff: chrome/renderer/render_view.cc

Issue 5619002: Revert 68094 - Refactoring BufferedDataSource to work with WebURLLoader inste... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years 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 | webkit/glue/media/buffered_data_source.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 68125)
+++ chrome/renderer/render_view.cc (working copy)
@@ -2818,10 +2818,29 @@
MessageLoop::current(), context->context()));
}
- // TODO(annacc): do we still need appcache_host? http://crbug.com/65135
- // WebApplicationCacheHostImpl* appcache_host =
- // WebApplicationCacheHostImpl::FromFrame(frame);
+ WebApplicationCacheHostImpl* appcache_host =
+ WebApplicationCacheHostImpl::FromFrame(frame);
+ // TODO(hclam): obtain the following parameters from |client|.
+ // Create two bridge factory for two data sources.
+ webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_simple =
+ new webkit_glue::MediaResourceLoaderBridgeFactory(
+ GURL(frame->url()), // referrer
+ "null", // frame origin
+ "null", // main_frame_origin
+ base::GetCurrentProcId(),
+ appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
+ routing_id());
+
+ webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_buffered =
+ new webkit_glue::MediaResourceLoaderBridgeFactory(
+ GURL(frame->url()), // referrer
+ "null", // frame origin
+ "null", // main_frame_origin
+ base::GetCurrentProcId(),
+ appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
+ routing_id());
+
scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer;
bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
@@ -2831,7 +2850,8 @@
scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
new webkit_glue::WebMediaPlayerImpl(client, collection.release()));
- if (!result->Initialize(frame,
+ if (!result->Initialize(bridge_factory_simple,
+ bridge_factory_buffered,
cmd_line->HasSwitch(switches::kSimpleDataSource),
video_renderer)) {
return NULL;
« no previous file with comments | « no previous file | webkit/glue/media/buffered_data_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698