| Index: skia/animator/SkOperand.h
|
| ===================================================================
|
| --- skia/animator/SkOperand.h (revision 16859)
|
| +++ skia/animator/SkOperand.h (working copy)
|
| @@ -1,54 +0,0 @@
|
| -/* libs/graphics/animator/SkOperand.h
|
| -**
|
| -** Copyright 2006, The Android Open Source Project
|
| -**
|
| -** Licensed under the Apache License, Version 2.0 (the "License");
|
| -** you may not use this file except in compliance with the License.
|
| -** You may obtain a copy of the License at
|
| -**
|
| -** http://www.apache.org/licenses/LICENSE-2.0
|
| -**
|
| -** Unless required by applicable law or agreed to in writing, software
|
| -** distributed under the License is distributed on an "AS IS" BASIS,
|
| -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
| -** See the License for the specific language governing permissions and
|
| -** limitations under the License.
|
| -*/
|
| -
|
| -#ifndef SkOperand_DEFINED
|
| -#define SkOperand_DEFINED
|
| -
|
| -#include "SkDisplayType.h"
|
| -
|
| -class SkTypedArray;
|
| -class SkDisplayable;
|
| -class SkDrawable;
|
| -class SkString;
|
| -
|
| -union SkOperand {
|
| -// SkOperand() {}
|
| -// SkOperand(SkScalar scalar) : fScalar(scalar) {}
|
| - SkTypedArray* fArray;
|
| - SkDisplayable* fDisplayable;
|
| - SkDrawable* fDrawable;
|
| - void* fObject;
|
| - int32_t fS32;
|
| - SkMSec fMSec;
|
| - SkScalar fScalar;
|
| - SkString* fString;
|
| -};
|
| -
|
| -struct SkScriptValue {
|
| - SkOperand fOperand;
|
| - 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; }
|
| - 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; }
|
| - SkScalar getScalar() { SkASSERT(fType == SkType_Float); return fOperand.fScalar; }
|
| - SkString* getString() { SkASSERT(fType == SkType_String); return fOperand.fString; }
|
| -};
|
| -
|
| -#endif // SkOperand_DEFINED
|
|
|