src/ports/SkGlobalInitialization_default.cpp - Issue 26606004: change SkAnnotation to not inherit from SkFlattenable (does not need dynamic factories)

Side by Side Diff: src/ports/SkGlobalInitialization_default.cpp

Issue 26606004: change SkAnnotation to not inherit from SkFlattenable (does not need dynamic factories) (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « src/pipe/SkGPipeWrite.cpp ('k') | no next file » | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright 2011 Google Inc.	2 * Copyright 2011 Google Inc.

3 *	3 *

4 * Use of this source code is governed by a BSD-style license that can be	4 * Use of this source code is governed by a BSD-style license that can be

5 * found in the LICENSE file.	5 * found in the LICENSE file.

6 */	6 */

7	7

8 #include "SkTypes.h"	8 #include "SkTypes.h"

9	9

10 #include "SkBitmapProcShader.h"	10 #include "SkBitmapProcShader.h"

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55 #include "SkPixelXorXfermode.h"	55 #include "SkPixelXorXfermode.h"

56 #include "SkRectShaderImageFilter.h"	56 #include "SkRectShaderImageFilter.h"

57 #include "SkStippleMaskFilter.h"	57 #include "SkStippleMaskFilter.h"

58 #include "SkTableColorFilter.h"	58 #include "SkTableColorFilter.h"

59 #include "SkTestImageFilters.h"	59 #include "SkTestImageFilters.h"

60 #include "SkTileImageFilter.h"	60 #include "SkTileImageFilter.h"

61 #include "SkXfermodeImageFilter.h"	61 #include "SkXfermodeImageFilter.h"

62	62

63 void SkFlattenable::InitializeFlattenables() {	63 void SkFlattenable::InitializeFlattenables() {

64	64

65 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAnnotation)

66 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode)	65 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode)

67 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBicubicImageFilter)	66 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBicubicImageFilter)

68 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)	67 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)

69 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSource)	68 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSource)

70 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)	69 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)

71 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter)	70 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter)

72 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilter)	71 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorMatrixFilter)

73 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader)	72 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorShader)

74 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorTable)	73 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorTable)

75 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect)	74 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposePathEffect)

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
110	109

111 SkArithmeticMode::InitializeFlattenables();	110 SkArithmeticMode::InitializeFlattenables();

112 SkBlurMaskFilter::InitializeFlattenables();	111 SkBlurMaskFilter::InitializeFlattenables();

113 SkColorFilter::InitializeFlattenables();	112 SkColorFilter::InitializeFlattenables();

114 SkGradientShader::InitializeFlattenables();	113 SkGradientShader::InitializeFlattenables();

115 SkImages::InitializeFlattenables();	114 SkImages::InitializeFlattenables();

116 SkLightingImageFilter::InitializeFlattenables();	115 SkLightingImageFilter::InitializeFlattenables();

117 SkTableColorFilter::InitializeFlattenables();	116 SkTableColorFilter::InitializeFlattenables();

118 SkXfermode::InitializeFlattenables();	117 SkXfermode::InitializeFlattenables();

119 }	118 }

OLD	NEW