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

Side by Side Diff: chrome/renderer/media/data_source_impl.cc

Issue 113069: Content-Dispositon handling fix #2. Still WiP. Uploading as a check point.... Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 7 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) 2009 The Chromium Authors. All rights reserved. Use of this 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
2 // source code is governed by a BSD-style license that can be found in the 2 // source code is governed by a BSD-style license that can be found in the
3 // LICENSE file. 3 // LICENSE file.
4 4
5 #include "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/message_loop.h" 6 #include "base/message_loop.h"
7 #include "base/process_util.h" 7 #include "base/process_util.h"
8 #include "chrome/renderer/media/data_source_impl.h" 8 #include "chrome/renderer/media/data_source_impl.h"
9 #include "chrome/renderer/render_view.h" 9 #include "chrome/renderer/render_view.h"
10 #include "chrome/renderer/webmediaplayer_delegate_impl.h" 10 #include "chrome/renderer/webmediaplayer_delegate_impl.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 // Prefer to load from cache, also enable downloading the file, the 230 // Prefer to load from cache, also enable downloading the file, the
231 // resource will be saved to a single response data file if it's possible. 231 // resource will be saved to a single response data file if it's possible.
232 net::LOAD_PREFERRING_CACHE | net::LOAD_ENABLE_DOWNLOAD_FILE, 232 net::LOAD_PREFERRING_CACHE | net::LOAD_ENABLE_DOWNLOAD_FILE,
233 base::GetCurrentProcId(), 233 base::GetCurrentProcId(),
234 ResourceType::MEDIA, 234 ResourceType::MEDIA,
235 0, 235 0,
236 // TODO(michaeln): delegate->mediaplayer->frame-> 236 // TODO(michaeln): delegate->mediaplayer->frame->
237 // app_cache_context()->context_id() 237 // app_cache_context()->context_id()
238 // For now don't service media resource requests from the appcache. 238 // For now don't service media resource requests from the appcache.
239 WebAppCacheContext::kNoAppCacheContextId, 239 WebAppCacheContext::kNoAppCacheContextId,
240 delegate_->view()->routing_id())); 240 delegate_->view()->routing_id(),
241 // TODO(jungshik): It might be useful in some cases
242 // (e.g. interpreting ID3v1 tags in mp3), but for now leave it empty
243 ""));
241 // Start the resource loading. 244 // Start the resource loading.
242 resource_loader_bridge_->Start(this); 245 resource_loader_bridge_->Start(this);
243 } 246 }
244 247
245 void DataSourceImpl::OnDestroy() { 248 void DataSourceImpl::OnDestroy() {
246 DCHECK(MessageLoop::current() == render_loop_); 249 DCHECK(MessageLoop::current() == render_loop_);
247 resource_loader_bridge_->Cancel(); 250 resource_loader_bridge_->Cancel();
248 resource_loader_bridge_.reset(); 251 resource_loader_bridge_.reset();
249 } 252 }
250 253
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 } 336 }
334 } 337 }
335 338
336 std::string DataSourceImpl::GetURLForDebugging() { 339 std::string DataSourceImpl::GetURLForDebugging() {
337 return uri_; 340 return uri_;
338 } 341 }
339 342
340 const media::MediaFormat& DataSourceImpl::media_format() { 343 const media::MediaFormat& DataSourceImpl::media_format() {
341 return media_format_; 344 return media_format_;
342 } 345 }
OLDNEW
« no previous file with comments | « chrome/renderer/media/buffered_data_source.cc ('k') | chrome/renderer/media/simple_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698