X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Fskia%2Fsrc%2Fanimator%2FSkScript2.h;h=d182e8c7c5dd46b47d291450ed4659f4189751bf;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=33e2af7fee7c9ec46c856d26988926880eeab765;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/skia/src/animator/SkScript2.h b/src/third_party/skia/src/animator/SkScript2.h index 33e2af7..d182e8c 100644 --- a/src/third_party/skia/src/animator/SkScript2.h +++ b/src/third_party/skia/src/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 {