diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:13:15 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:13:15 +0100 |
| commit | 6b0bad3aba066dc8d7d47a5f6738ebf773ffc2e9 (patch) | |
| tree | ad988be7ad87928b7b98c44f2def4cce7d3330b6 /animator/SkScript2.h | |
| parent | 27ab20dffff01006f5d20fdb2b3f4ea503d69114 (diff) | |
| parent | d60f7edf0fa7eb2eb7c99de486abfe61ad3dcd69 (diff) | |
| download | src-6b0bad3aba066dc8d7d47a5f6738ebf773ffc2e9.tar.gz | |
This commit was generated by merge_to_master.py.
Change-Id: I9d3335dcb08fc53d18bec993b89047b409bd7eb1
Diffstat (limited to 'animator/SkScript2.h')
| -rw-r--r-- | animator/SkScript2.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/animator/SkScript2.h b/animator/SkScript2.h index 33e2af7f..d182e8c7 100644 --- a/animator/SkScript2.h +++ b/animator/SkScript2.h @@ -188,8 +188,9 @@ protected: Branch() { } - Branch(Op op, int depth, unsigned offset) : fOffset(offset), fOpStackDepth(depth), fOperator(op), - fPrimed(kIsNotPrimed), fDone(kIsNotDone) { + Branch(Op op, int depth, size_t offset) + : fOffset(SkToU16(offset)), fOpStackDepth(depth), fOperator(op) + , fPrimed(kIsNotPrimed), fDone(kIsNotDone) { } enum Primed { |