Remove some unnecessary uses of SkOnce.

gm/imagefiltersgraph.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "SkArithmeticMode.h"
 #include "SkDevice.h"
 #include "SkBitmapSource.h"
 #include "SkBlurImageFilter.h"
 #include "SkColorFilter.h"
 #include "SkColorFilterImageFilter.h"
 #include "SkColorMatrixFilter.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkMergeImageFilter.h"
 #include "SkMorphologyImageFilter.h"
-#include "SkOnce.h"
 #include "SkTestImageFilters.h"
 #include "SkXfermodeImageFilter.h"
 
 // More closely models how Blink's OffsetFilter works as of 10/23/13. SkOffsetImageFilter doesn't
 // perform a draw and this one does.
 class SimpleOffsetFilter : public SkImageFilter {
 public:
     static SkImageFilter* Create(SkScalar dx, SkScalar dy, SkImageFilter* input) {
         return SkNEW_ARGS(SimpleOffsetFilter, (dx, dy, input));
     }
@@ skipping 38 matching lines @@
         buffer.writeScalar(fDY);
     }
 
 private:
     SimpleOffsetFilter(SkScalar dx, SkScalar dy, SkImageFilter* input)
     : SkImageFilter(input), fDX(dx), fDY(dy) {}
 
     SkScalar fDX, fDY;
 };
 
-static void init_flattenable(int*) {
-    SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SimpleOffsetFilter)
-}
+SkFlattenable::Registrar registrar("SimpleOffsetFilter",
+                                   SimpleOffsetFilter::CreateProc,
+                                   SimpleOffsetFilter::GetFlattenableType());
 
 class ImageFiltersGraphGM : public skiagm::GM {
 public:
-    ImageFiltersGraphGM() : fInitialized(false) {
-        int dummy;
-        SK_DECLARE_STATIC_ONCE(once);
-        SkOnce(&once, init_flattenable, &dummy);
-    }
+    ImageFiltersGraphGM() {}
 
 protected:
     virtual uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
     virtual SkString onShortName() {
         return SkString("imagefiltersgraph");
     }
 
@@ skipping 12 matching lines @@
     void drawClippedBitmap(SkCanvas* canvas, const SkBitmap& bitmap, const SkPaint& paint) {
         canvas->save();
         canvas->clipRect(SkRect::MakeXYWH(0, 0,
             SkIntToScalar(bitmap.width()), SkIntToScalar(bitmap.height())));
         canvas->drawBitmap(bitmap, 0, 0, &paint);
         canvas->restore();
     }
 
     virtual SkISize onISize() { return SkISize::Make(500, 150); }
 
+    virtual void onOnceBeforeDraw() {
+        this->make_bitmap();
+    }
+
     virtual void onDraw(SkCanvas* canvas) {
-        if (!fInitialized) {
-            this->make_bitmap();
-            fInitialized = true;
-        }
         canvas->clear(0x00000000);
         {
             SkAutoTUnref<SkImageFilter> bitmapSource(SkBitmapSource::Create(fBitmap));
             SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateModeFilter(SK_ColorRED,
                                                          SkXfermode::kSrcIn_Mode));
             SkAutoTUnref<SkImageFilter> blur(SkBlurImageFilter::Create(4.0f, 4.0f, bitmapSource));
             SkAutoTUnref<SkImageFilter> erode(SkErodeImageFilter::Create(4, 4, blur));
             SkAutoTUnref<SkImageFilter> color(SkColorFilterImageFilter::Create(cf, erode));
             SkAutoTUnref<SkImageFilter> merge(SkMergeImageFilter::Create(blur, color));
 
@@ skipping 70 matching lines @@
             paint.setImageFilter(color2);
             paint.setColor(0xFFFF0000);
             canvas->drawRect(SkRect::MakeXYWH(0, 0, 100, 100), paint);
             canvas->translate(SkIntToScalar(100), 0);
         }
     }
 
 private:
     typedef GM INHERITED;
     SkBitmap fBitmap;
-    bool fInitialized;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new ImageFiltersGraphGM; }
 static skiagm::GMRegistry reg(MyFactory);