| Index: services/media/framework_mojo/mojo_pull_mode_producer.h
|
| diff --git a/services/media/framework_mojo/mojo_pull_mode_producer.h b/services/media/framework_mojo/mojo_pull_mode_producer.h
|
| index 8ba6fc6f47f13636f7f6cc95f396f8195329dfd3..0d27a7437f5102dc3cb2fffa9b8a23b0549da1e4 100644
|
| --- a/services/media/framework_mojo/mojo_pull_mode_producer.h
|
| +++ b/services/media/framework_mojo/mojo_pull_mode_producer.h
|
| @@ -18,9 +18,7 @@ namespace mojo {
|
| namespace media {
|
|
|
| // Implements MediaPullModeProducer to forward a stream across mojo.
|
| -class MojoPullModeProducer :
|
| - public MediaPullModeProducer,
|
| - public ActiveSink {
|
| +class MojoPullModeProducer : public MediaPullModeProducer, public ActiveSink {
|
| public:
|
| static std::shared_ptr<MojoPullModeProducer> Create() {
|
| return std::shared_ptr<MojoPullModeProducer>(new MojoPullModeProducer());
|
| @@ -34,9 +32,8 @@ class MojoPullModeProducer :
|
| // MediaPullModeProducer implementation.
|
| void GetBuffer(const GetBufferCallback& callback) override;
|
|
|
| - void PullPacket(
|
| - MediaPacketPtr to_release,
|
| - const PullPacketCallback& callback) override;
|
| + void PullPacket(MediaPacketPtr to_release,
|
| + const PullPacketCallback& callback) override;
|
|
|
| void ReleasePacket(MediaPacketPtr to_release) override;
|
|
|
| @@ -60,9 +57,8 @@ class MojoPullModeProducer :
|
|
|
| // Runs the callback with a new MediaPacket created from the given Packet.
|
| // MUST BE CALLED WITH lock_ TAKEN.
|
| - void HandlePullWithPacketUnsafe(
|
| - const PullPacketCallback& callback,
|
| - PacketPtr packet);
|
| + void HandlePullWithPacketUnsafe(const PullPacketCallback& callback,
|
| + PacketPtr packet);
|
|
|
| // Creates a MediaPacket from a Packet.
|
| MediaPacketPtr CreateMediaPacket(const PacketPtr& packet);
|
|
|