Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "webkit/media/webmediaplayer_impl.h" | 5 #include "webkit/media/webmediaplayer_impl.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 267 url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode), | 267 url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode), |
| 268 base::Bind( | 268 base::Bind( |
| 269 &WebMediaPlayerImpl::DataSourceInitialized, | 269 &WebMediaPlayerImpl::DataSourceInitialized, |
| 270 AsWeakPtr(), gurl)); | 270 AsWeakPtr(), gurl)); |
| 271 | 271 |
| 272 is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https"); | 272 is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https"); |
| 273 | 273 |
| 274 BuildDefaultCollection(proxy_->data_source(), | 274 BuildDefaultCollection(proxy_->data_source(), |
| 275 message_loop_factory_.get(), | 275 message_loop_factory_.get(), |
| 276 filter_collection_.get(), | 276 filter_collection_.get(), |
| 277 &decryptor_); | 277 &decryptor_, |
| 278 base::Bind(&WebMediaPlayerProxy::DemuxerNeedKey, | |
| 279 base::Unretained(proxy_.get()))); | |
|
xhwang
2012/08/29 05:08:14
Do you need base::Unretained? The WebMediaPlayerPr
| |
| 278 } | 280 } |
| 279 | 281 |
| 280 void WebMediaPlayerImpl::cancelLoad() { | 282 void WebMediaPlayerImpl::cancelLoad() { |
| 281 DCHECK_EQ(main_loop_, MessageLoop::current()); | 283 DCHECK_EQ(main_loop_, MessageLoop::current()); |
| 282 } | 284 } |
| 283 | 285 |
| 284 void WebMediaPlayerImpl::play() { | 286 void WebMediaPlayerImpl::play() { |
| 285 DCHECK_EQ(main_loop_, MessageLoop::current()); | 287 DCHECK_EQ(main_loop_, MessageLoop::current()); |
| 286 | 288 |
| 287 paused_ = false; | 289 paused_ = false; |
| (...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1050 return audio_source_provider_; | 1052 return audio_source_provider_; |
| 1051 } | 1053 } |
| 1052 | 1054 |
| 1053 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { | 1055 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { |
| 1054 DCHECK_EQ(main_loop_, MessageLoop::current()); | 1056 DCHECK_EQ(main_loop_, MessageLoop::current()); |
| 1055 incremented_externally_allocated_memory_ = true; | 1057 incremented_externally_allocated_memory_ = true; |
| 1056 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); | 1058 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); |
| 1057 } | 1059 } |
| 1058 | 1060 |
| 1059 } // namespace webkit_media | 1061 } // namespace webkit_media |
| OLD | NEW |