| Index: src/ports/SkGlobalInitialization_default.cpp
|
| diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
|
| index 949decd0186a50a546d5bf36ec04532e7800effc..ce42ca5aad293b6104d43d60c13e6d053b2d1fc4 100644
|
| --- a/src/ports/SkGlobalInitialization_default.cpp
|
| +++ b/src/ports/SkGlobalInitialization_default.cpp
|
| @@ -62,7 +62,7 @@
|
| #include "SkMatrixImageFilter.h"
|
| #include "SkXfermodeImageFilter.h"
|
|
|
| -static void InitializeFlattenables(int*) {
|
| +static void InitializeFlattenables() {
|
| SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode)
|
| SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBicubicImageFilter)
|
| SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)
|
| @@ -123,7 +123,6 @@ static void InitializeFlattenables(int*) {
|
| }
|
|
|
| void SkFlattenable::InitializeFlattenablesIfNeeded() {
|
| - int dummy;
|
| SK_DECLARE_STATIC_ONCE(once);
|
| - SkOnce(&once, InitializeFlattenables, &dummy);
|
| + SkOnce(&once, InitializeFlattenables);
|
| }
|
|
|