commit 92f93264e760b74cc706d01b2d0fcfaa3d857f51
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sun May 04 01:26:19 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Sun May 04 01:26:19 2014 +0000
tree 9c2510262763e22793e653c83918424e841c1c33
parent f8a8ae1322e55d37b3b4b0e25d56f72ab2ee5c09

fix size_t/int warnings

TBR=caryclark@google.com

Author: reed@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14560 2bbb7eff-a529-9590-31e7-b0007b416f81

src/animator/SkScriptTokenizer.cpp

diff --git a/src/animator/SkScriptTokenizer.cpp b/src/animator/SkScriptTokenizer.cpp
index 8fc5d80..03ffaa4 100644
--- a/src/animator/SkScriptTokenizer.cpp
+++ b/src/animator/SkScriptTokenizer.cpp
@@ -170,7 +170,7 @@
 }
 
 void SkScriptEngine2::addTokenString(const SkString& string) {
-    int size = string.size();
+    int size = SkToInt(string.size());
     addTokenInt(size);
     fActiveStream->write(string.c_str(), size);
 }
@@ -1023,7 +1023,7 @@
             branch.fOperator = op;
             branch.fDone = Branch::kIsNotDone;
             SkASSERT(branch.fOpStackDepth == fOpStack.count());
-            branch.fOffset = newOffset;
+            branch.fOffset = SkToU16(newOffset);
             fAccumulatorType = SkOperand2::kNoType;
         } break;
         case kLogicalAnd: