Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(551)

Unified Diff: src/animator/SkScriptTokenizer.cpp

Issue 265163003: fix size_t/int warnings (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/animator/SkScript2.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkScriptTokenizer.cpp
diff --git a/src/animator/SkScriptTokenizer.cpp b/src/animator/SkScriptTokenizer.cpp
index 8fc5d802cb1b5acac67fb828f11b184fc5dbcfc4..03ffaa4a721bd195251ba5fc07b2e5bf6e376a6f 100644
--- a/src/animator/SkScriptTokenizer.cpp
+++ b/src/animator/SkScriptTokenizer.cpp
@@ -170,7 +170,7 @@ void SkScriptEngine2::addTokenScalar(SkScalar scalar) {
}
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 @@ void SkScriptEngine2::processLogicalOp(Op op) {
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:
« no previous file with comments | « src/animator/SkScript2.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698