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

Unified Diff: mojo/services/media/common/cpp/timeline_function.h

Issue 1986303002: Motown: Use new TimelineTransform and related definitions (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fixes per feedback. Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/media/common/cpp/timeline.h ('k') | mojo/services/media/common/cpp/timeline_function.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/media/common/cpp/timeline_function.h
diff --git a/mojo/services/media/common/cpp/timeline_function.h b/mojo/services/media/common/cpp/timeline_function.h
index 67ac80a89d9f3fef629b52fad82831945209f14c..075ee016b8a5ff27bbfe5d0935124f548b19e537 100644
--- a/mojo/services/media/common/cpp/timeline_function.h
+++ b/mojo/services/media/common/cpp/timeline_function.h
@@ -5,8 +5,10 @@
#ifndef MOJO_SERVICES_MEDIA_COMMON_CPP_TIMELINE_FUNCTION_H_
#define MOJO_SERVICES_MEDIA_COMMON_CPP_TIMELINE_FUNCTION_H_
+#include "mojo/public/cpp/bindings/type_converter.h"
#include "mojo/public/cpp/environment/logging.h"
#include "mojo/services/media/common/cpp/timeline_rate.h"
+#include "mojo/services/media/common/interfaces/timelines.mojom.h"
namespace mojo {
namespace media {
@@ -128,6 +130,19 @@ inline TimelineFunction operator*(const TimelineFunction& bc,
}
} // namespace media
+
+template <>
+struct TypeConverter<TimelineTransformPtr, media::TimelineFunction> {
+ static TimelineTransformPtr Convert(
+ const media::TimelineFunction& input);
+};
+
+template <>
+struct TypeConverter<media::TimelineFunction, TimelineTransformPtr> {
+ static media::TimelineFunction Convert(
+ const TimelineTransformPtr& input);
+};
+
} // namespace mojo
#endif // MOJO_SERVICES_MEDIA_COMMON_CPP_TIMELINE_FUNCTION_H_
« no previous file with comments | « mojo/services/media/common/cpp/timeline.h ('k') | mojo/services/media/common/cpp/timeline_function.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698