Teach BindToLoop to create callbacks that accept scoped parameters.

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 78 matching lines @@
                  mismatching_enums)
 COMPILE_ASSERT_MATCHING_ENUM(Unspecified);
 COMPILE_ASSERT_MATCHING_ENUM(Anonymous);
 COMPILE_ASSERT_MATCHING_ENUM(UseCredentials);
 #undef COMPILE_ASSERT_MATCHING_ENUM
 
 #define BIND_TO_RENDER_LOOP(function) \
   media::BindToLoop(main_loop_->message_loop_proxy(), base::Bind( \
       function, AsWeakPtr()))
 
+#define BIND_TO_RENDER_LOOP_2(function, arg1, arg2)                 \

[xhwang, 2012/10/23 21:37:03]

remove extra spaces?

[Ami GONE FROM CHROMIUM, 2012/10/23 21:58:07]

Done.

+  media::BindToLoop(main_loop_->message_loop_proxy(), base::Bind( \
+      function, AsWeakPtr(), arg1, arg2))
+
 static WebKit::WebTimeRanges ConvertToWebTimeRanges(
     const media::Ranges<base::TimeDelta>& ranges) {
   WebKit::WebTimeRanges result(ranges.size());
   for (size_t i = 0; i < ranges.size(); i++) {
     result[i].start = ranges.start(i).InSecondsF();
     result[i].end = ranges.end(i).InSecondsF();
   }
   return result;
 }
 
 // TODO(acolwell): Investigate whether the key_system & session_id parameters
 // are really necessary.
 typedef base::Callback<void(const std::string&,
                             const std::string&,
                             scoped_array<uint8>,
                             int)> OnNeedKeyCB;
 
-static void OnDemuxerNeedKeyTrampoline(
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
-    const OnNeedKeyCB& need_key_cb,
-    scoped_array<uint8> init_data,
-    int init_data_size) {
-  message_loop->PostTask(FROM_HERE, base::Bind(
-      need_key_cb, "", "", base::Passed(&init_data), init_data_size));
-}
-
 WebMediaPlayerImpl::WebMediaPlayerImpl(
     WebKit::WebFrame* frame,
     WebKit::WebMediaPlayerClient* client,
     base::WeakPtr<WebMediaPlayerDelegate> delegate,
     media::FilterCollection* collection,
     WebKit::WebAudioSourceProvider* audio_source_provider,
     media::AudioRendererSink* audio_renderer_sink,
     media::MessageLoopFactory* message_loop_factory,
     MediaStreamClient* media_stream_client,
     media::MediaLog* media_log)
@@ skipping 131 matching lines @@
                                  filter_collection_.get())) {
     supports_save_ = false;
     StartPipeline();
     return;
   }
 
   // Media source pipelines can start immediately.
   if (!url.isEmpty() && url == GetClient()->sourceURL()) {
     chunk_demuxer_ = new media::ChunkDemuxer(
         BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
-        base::Bind(&OnDemuxerNeedKeyTrampoline,
-                   main_loop_->message_loop_proxy(),
-                   base::Bind(&WebMediaPlayerImpl::OnNeedKey, AsWeakPtr())));
+        BIND_TO_RENDER_LOOP_2(&WebMediaPlayerImpl::OnNeedKey, "", ""));

[xhwang, 2012/10/23 21:37:03]

Thanks for fixing this :)

 
     BuildMediaSourceCollection(chunk_demuxer_,
                                message_loop_factory_.get(),
                                filter_collection_.get(),
                                &decryptor_);
     supports_save_ = false;
     StartPipeline();
     return;
   }
 
@@ skipping 807 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media