src/ports/SkGlobalInitialization_default.cpp - Issue 320873003: change pixelref to not inherit from SkFlattenable

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 320873003: change pixelref to not inherit from SkFlattenable (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: rebase Created 6 years, 5 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

« no previous file with comments | « src/lazy/SkDiscardablePixelRef.h ('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 88 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
99 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixImageFilter)	99 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixImageFilter)

100 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkXfermodeImageFilter)	100 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkXfermodeImageFilter)

101 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMagnifierImageFilter)	101 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMagnifierImageFilter)

102 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixConvolutionImageFilter)	102 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMatrixConvolutionImageFilter)

103	103

104 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOffsetImageFilter)	104 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkOffsetImageFilter)

105 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeImageFilter)	105 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeImageFilter)

106 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)	106 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)

107 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)	107 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)

108 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)	108 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)

	109 #ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE

109 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMallocPixelRef)	110 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMallocPixelRef)

	111 #endif

110	112

111 SkArithmeticMode::InitializeFlattenables();	113 SkArithmeticMode::InitializeFlattenables();

112 SkBlurMaskFilter::InitializeFlattenables();	114 SkBlurMaskFilter::InitializeFlattenables();

113 SkColorFilter::InitializeFlattenables();	115 SkColorFilter::InitializeFlattenables();

114 SkGradientShader::InitializeFlattenables();	116 SkGradientShader::InitializeFlattenables();

115 SkLightingImageFilter::InitializeFlattenables();	117 SkLightingImageFilter::InitializeFlattenables();

116 SkTableColorFilter::InitializeFlattenables();	118 SkTableColorFilter::InitializeFlattenables();

117 SkXfermode::InitializeFlattenables();	119 SkXfermode::InitializeFlattenables();

118	120

119 }	121 }

120	122

121 void SkFlattenable::InitializeFlattenablesIfNeeded() {	123 void SkFlattenable::InitializeFlattenablesIfNeeded() {

122 SK_DECLARE_STATIC_ONCE(once);	124 SK_DECLARE_STATIC_ONCE(once);

123 SkOnce(&once, InitializeFlattenables);	125 SkOnce(&once, InitializeFlattenables);

124 }	126 }

OLD	NEW