Chromium Code Reviews| Index: src/animator/SkOperand.h |
| diff --git a/src/animator/SkOperand.h b/src/animator/SkOperand.h |
| index 0bd1fa3403d97204b8374e41d37372f2cbb130ed..14126fccbfda24fba2675f9f406cd8343cfcc907 100644 |
| --- a/src/animator/SkOperand.h |
| +++ b/src/animator/SkOperand.h |
| @@ -14,7 +14,7 @@ |
| class SkTypedArray; |
| class SkDisplayable; |
| -class SkDrawable; |
| +class SkADrawable; |
|
tfarina
2014/11/26 14:26:30
sort?
|
| class SkString; |
| union SkOperand { |
| @@ -22,7 +22,7 @@ union SkOperand { |
| // SkOperand(SkScalar scalar) : fScalar(scalar) {} |
| SkTypedArray* fArray; |
| SkDisplayable* fDisplayable; |
| - SkDrawable* fDrawable; |
| + SkADrawable* fDrawable; |
| void* fObject; |
| int32_t fS32; |
| SkMSec fMSec; |
| @@ -35,7 +35,7 @@ struct SkScriptValue { |
| SkDisplayTypes fType; |
| SkTypedArray* getArray() { SkASSERT(fType == SkType_Array); return fOperand.fArray; } |
| SkDisplayable* getDisplayable() { SkASSERT(fType == SkType_Displayable); return fOperand.fDisplayable; } |
| - SkDrawable* getDrawable() { SkASSERT(fType == SkType_Drawable); return fOperand.fDrawable; } |
| + SkADrawable* getDrawable() { SkASSERT(fType == SkType_Drawable); return fOperand.fDrawable; } |
| int32_t getS32(SkAnimateMaker* maker) { SkASSERT(fType == SkType_Int || fType == SkType_Boolean || |
| SkDisplayType::IsEnum(maker, fType)); return fOperand.fS32; } |
| SkMSec getMSec() { SkASSERT(fType == SkType_MSec); return fOperand.fMSec; } |