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

Unified Diff: webkit/media/webmediaplayer_impl.cc

Issue 9864022: Move DataSource::SetPreload() to BufferedDataSource. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/webkit_media.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 61b478c7d1ad731699cdea3a4f2256d677d3a39b..e0d4741d6a0adead19e09d02b385d13fa2c89788 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -364,7 +364,7 @@ void WebMediaPlayerImpl::setVisible(bool visible) {
#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, chromium_name) \
COMPILE_ASSERT(static_cast<int>(WebKit::WebMediaPlayer::webkit_name) == \
- static_cast<int>(media::chromium_name), \
+ static_cast<int>(webkit_media::chromium_name), \
mismatching_enums)
COMPILE_ASSERT_MATCHING_ENUM(None, NONE);
COMPILE_ASSERT_MATCHING_ENUM(MetaData, METADATA);
@@ -373,7 +373,11 @@ COMPILE_ASSERT_MATCHING_ENUM(Auto, AUTO);
void WebMediaPlayerImpl::setPreload(WebKit::WebMediaPlayer::Preload preload) {
DCHECK_EQ(main_loop_, MessageLoop::current());
- pipeline_->SetPreload(static_cast<media::Preload>(preload));
+ if (proxy_ && proxy_->data_source()) {
+ // XXX: Why do I need to use webkit_media:: prefix? clang complains!
scherkus (not reviewing) 2012/03/27 02:52:06 note: I'm investigating this
+ proxy_->data_source()->SetPreload(
+ static_cast<webkit_media::Preload>(preload));
+ }
}
bool WebMediaPlayerImpl::totalBytesKnown() {
« no previous file with comments | « webkit/media/webkit_media.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698