Index: media/mojo/services/mojo_cdm.h |
diff --git a/media/mojo/services/mojo_cdm.h b/media/mojo/services/mojo_cdm.h |
index 40837282210252be77281045e99d2c9ed53f57c8..0368e2660b0431be231a87d2ea08e61d09fb8ff2 100644 |
--- a/media/mojo/services/mojo_cdm.h |
+++ b/media/mojo/services/mojo_cdm.h |
@@ -77,7 +77,12 @@ class MojoCdm : public MediaKeys, public mojo::ContentDecryptionModuleClient { |
template <typename... T> |
void OnPromiseResult(scoped_ptr<CdmPromiseTemplate<T...>> promise, |
mojo::CdmPromiseResultPtr result, |
- typename MojoTypeTrait<T>::MojoType... args); |
+ typename MojoTypeTrait<T>::MojoType... args) { |
Slava Chigrin
2015/01/18 22:12:26
Microsoft compiler in VS 2013 fails compile such m
xhwang
2015/01/19 02:59:51
Add a note/comment here so that we keep record of
|
+ if (result->success) |
+ promise->resolve(args.template To<T>()...); // See ISO C++03 14.2/4. |
+ else |
+ RejectPromise(promise.Pass(), result.Pass()); |
+ } |
mojo::ContentDecryptionModulePtr remote_cdm_; |