| OLD | NEW | 
|---|
| 1 | 1 | 
| 2 /* | 2 /* | 
| 3  * Copyright 2006 The Android Open Source Project | 3  * Copyright 2006 The Android Open Source Project | 
| 4  * | 4  * | 
| 5  * Use of this source code is governed by a BSD-style license that can be | 5  * Use of this source code is governed by a BSD-style license that can be | 
| 6  * found in the LICENSE file. | 6  * found in the LICENSE file. | 
| 7  */ | 7  */ | 
| 8 | 8 | 
| 9 | 9 | 
| 10 #ifndef SkDrawPaint_DEFINED | 10 #ifndef SkDrawPaint_DEFINED | 
| 11 #define SkDrawPaint_DEFINED | 11 #define SkDrawPaint_DEFINED | 
| 12 | 12 | 
| 13 #include "SkADrawable.h" | 13 #include "SkADrawable.h" | 
| 14 #include "SkIntArray.h" | 14 #include "SkIntArray.h" | 
| 15 #include "SkMemberInfo.h" | 15 #include "SkMemberInfo.h" | 
| 16 #include "SkPaint.h" | 16 #include "SkPaint.h" | 
| 17 #include "SkXfermode.h" | 17 #include "SkXfermode.h" | 
| 18 | 18 | 
| 19 class SkDrawMaskFilter; | 19 class SkDrawMaskFilter; | 
| 20 class SkDrawPathEffect; | 20 class SkDrawPathEffect; | 
| 21 class SkDrawShader; | 21 class SkDrawShader; | 
| 22 class SkTransferMode; | 22 class SkTransferMode; | 
| 23 class SkDrawTypeface; | 23 class SkDrawTypeface; | 
| 24 | 24 | 
| 25 class SkDrawPaint : public SkADrawable { | 25 class SkDrawPaint : public SkADrawable { | 
| 26     DECLARE_DRAW_MEMBER_INFO(Paint); | 26     DECLARE_DRAW_MEMBER_INFO(Paint); | 
| 27     SkDrawPaint(); | 27     SkDrawPaint(); | 
| 28     virtual ~SkDrawPaint(); | 28     virtual ~SkDrawPaint(); | 
| 29     virtual bool add(SkAnimateMaker* , SkDisplayable* child); | 29     virtual bool add(SkAnimateMaker* , SkDisplayable* child); | 
| 30     SkDisplayable* deepCopy(SkAnimateMaker* ) SK_OVERRIDE; | 30     SkDisplayable* deepCopy(SkAnimateMaker* ) override; | 
| 31     bool draw(SkAnimateMaker& ) SK_OVERRIDE; | 31     bool draw(SkAnimateMaker& ) override; | 
| 32 #ifdef SK_DUMP_ENABLED | 32 #ifdef SK_DUMP_ENABLED | 
| 33     void dump(SkAnimateMaker* ) SK_OVERRIDE; | 33     void dump(SkAnimateMaker* ) override; | 
| 34 #endif | 34 #endif | 
| 35     virtual void executeFunction(SkDisplayable* target, int index, | 35     virtual void executeFunction(SkDisplayable* target, int index, | 
| 36         SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, | 36         SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, | 
| 37         SkScriptValue* ) SK_OVERRIDE; | 37         SkScriptValue* ) override; | 
| 38     const SkFunctionParamType* getFunctionsParameters() SK_OVERRIDE; | 38     const SkFunctionParamType* getFunctionsParameters() override; | 
| 39     bool getProperty(int index, SkScriptValue* value) const SK_OVERRIDE; | 39     bool getProperty(int index, SkScriptValue* value) const override; | 
| 40     bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* app
    ly) SK_OVERRIDE; | 40     bool resolveIDs(SkAnimateMaker& maker, SkDisplayable* original, SkApply* app
    ly) override; | 
| 41 protected: | 41 protected: | 
| 42     static const SkFunctionParamType fFunctionParameters[]; | 42     static const SkFunctionParamType fFunctionParameters[]; | 
| 43     void setupPaint(SkPaint* paint) const; | 43     void setupPaint(SkPaint* paint) const; | 
| 44 public: | 44 public: | 
| 45     SkBool antiAlias; | 45     SkBool antiAlias; | 
| 46     SkDrawColor* color; | 46     SkDrawColor* color; | 
| 47     SkBool fakeBold; | 47     SkBool fakeBold; | 
| 48     SkBool filterBitmap; | 48     SkBool filterBitmap; | 
| 49     SkBool linearText; | 49     SkBool linearText; | 
| 50     SkDrawMaskFilter* maskFilter; | 50     SkDrawMaskFilter* maskFilter; | 
| (...skipping 19 matching lines...) Expand all  Loading... | 
| 70     SkBool8 fOwnsShader; | 70     SkBool8 fOwnsShader; | 
| 71     SkBool8 fOwnsTransferMode; | 71     SkBool8 fOwnsTransferMode; | 
| 72     SkBool8 fOwnsTypeface; | 72     SkBool8 fOwnsTypeface; | 
| 73 private: | 73 private: | 
| 74     typedef SkADrawable INHERITED; | 74     typedef SkADrawable INHERITED; | 
| 75     friend class SkTextToPath; | 75     friend class SkTextToPath; | 
| 76     friend class SkSaveLayer; | 76     friend class SkSaveLayer; | 
| 77 }; | 77 }; | 
| 78 | 78 | 
| 79 #endif // SkDrawPaint_DEFINED | 79 #endif // SkDrawPaint_DEFINED | 
| OLD | NEW | 
|---|