Skip to content

Commit

Permalink
Update callback.h.pump for better output.
Browse files Browse the repository at this point in the history
R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/363293003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281298 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
qsr@chromium.org committed Jul 3, 2014
1 parent c35b116 commit c07b915
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
7 changes: 4 additions & 3 deletions mojo/public/cpp/bindings/callback.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ class Callback<void()> {
template <typename Sink>
struct Adapter : public Runnable {
explicit Adapter(const Sink& sink) : sink(sink) {}
virtual void Run() const MOJO_OVERRIDE { sink.Run(); }
virtual void Run() const MOJO_OVERRIDE {
sink.Run();
}
Sink sink;
};

Expand All @@ -77,8 +79,7 @@ class Callback<void(A1)> {
template <typename Sink>
Callback(const Sink& sink) : sink_(new Adapter<Sink>(sink)) {}

void Run(
typename internal::Callback_ParamTraits<A1>::ForwardType a1) const {
void Run(typename internal::Callback_ParamTraits<A1>::ForwardType a1) const {
if (sink_.get())
sink_->Run(internal::Forward(a1));
}
Expand Down
25 changes: 15 additions & 10 deletions mojo/public/cpp/bindings/callback.h.pump
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ class Callback<void($for ARG , [[A$(ARG)]])> {
public:
struct Runnable {
virtual ~Runnable() {}
virtual void Run(
$for ARG ,
virtual void Run($if ARITY > 0 [[

]]$for ARG ,
[[typename internal::Callback_ParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) const = 0;
};

Expand All @@ -47,12 +48,14 @@ class Callback<void($for ARG , [[A$(ARG)]])> {
template <typename Sink>
Callback(const Sink& sink) : sink_(new Adapter<Sink>(sink)) {}

void Run(
$for ARG ,
void Run($if ARITY > 1 [[

]]$for ARG ,
[[typename internal::Callback_ParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) const {
if (sink_.get())
sink_->Run(
$for ARG ,
sink_->Run($if ARITY > 1 [[

]]$for ARG ,
[[internal::Forward(a$(ARG))]]);
}

Expand All @@ -64,11 +67,13 @@ class Callback<void($for ARG , [[A$(ARG)]])> {
template <typename Sink>
struct Adapter : public Runnable {
explicit Adapter(const Sink& sink) : sink(sink) {}
virtual void Run(
$for ARG ,
virtual void Run($if ARITY > 0 [[

]]$for ARG ,
[[typename internal::Callback_ParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) const MOJO_OVERRIDE {
sink.Run(
$for ARG ,
sink.Run($if ARITY > 1 [[

]]$for ARG ,
[[internal::Forward(a$(ARG))]]);
}
Sink sink;
Expand Down

0 comments on commit c07b915

Please sign in to comment.