Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / animator / SkScript2.h

diff --git a/src/third_party/skia/src/animator/SkScript2.h b/src/third_party/skia/src/animator/SkScript2.h
index 33e2af7..d182e8c 100644 (file)
--- 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 {