diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-05-05 09:37:26 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-05-05 09:37:26 +0000 |
| commit | 43da11591e9e1e02f72fad01dfe9757a60dfbf93 (patch) | |
| tree | c4ec8a7eda4ca2334e9b9edd7a635f42ad5439e3 | |
| parent | 171144ac188494ad95f0a19dd46de7895e297104 (diff) | |
| parent | 0df451d5563e6536af9bd328e31d4b6ed4dbc07c (diff) | |
| download | src-43da11591e9e1e02f72fad01dfe9757a60dfbf93.tar.gz | |
Merge third_party/skia/src from https://chromium.googlesource.com/external/skia/src.git at 0df451d5563e6536af9bd328e31d4b6ed4dbc07c
This commit was generated by merge_from_chromium.py.
Change-Id: I0e0b91322126fd3f72f3245fbdd44e5e2d25c60e
| -rw-r--r-- | animator/SkAnimateSet.cpp | 2 | ||||
| -rw-r--r-- | animator/SkScript2.h | 5 | ||||
| -rw-r--r-- | animator/SkScriptTokenizer.cpp | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/animator/SkAnimateSet.cpp b/animator/SkAnimateSet.cpp index f153b16b..d146118e 100644 --- a/animator/SkAnimateSet.cpp +++ b/animator/SkAnimateSet.cpp @@ -62,7 +62,7 @@ void SkSet::onEndElement(SkAnimateMaker& maker) { fReset = dur != 1; SkDisplayTypes outType = fFieldInfo->getType(); int comps = outType == SkType_String || outType == SkType_DynamicString ? 1 : - fFieldInfo->getSize((const SkDisplayable*) fTarget) / sizeof(int); + (int)fFieldInfo->getSize((const SkDisplayable*) fTarget) / sizeof(int); if (fValues.getType() == SkType_Unknown) { fValues.setType(outType); fValues.setCount(comps); 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 { diff --git a/animator/SkScriptTokenizer.cpp b/animator/SkScriptTokenizer.cpp index 8fc5d802..03ffaa4a 100644 --- a/animator/SkScriptTokenizer.cpp +++ b/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: |