[WIP] Add Context to SkDrawLooper.

include/effects/SkLayerDrawLooper.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkLayerDrawLooper_DEFINED
 #define SkLayerDrawLooper_DEFINED
 
@@ skipping 84 matching lines @@
     void addLayer(SkScalar dx, SkScalar dy);
 
     /**
      *  This layer will with the original paint and no offset.
      */
     void addLayer() { this->addLayer(0, 0); }
 
     /// Similar to addLayer, but adds a layer to the top.
     SkPaint* addLayerOnTop(const LayerInfo&);
 
-    // overrides from SkDrawLooper
-    virtual void init(SkCanvas*);
-    virtual bool next(SkCanvas*, SkPaint* paint);
+    virtual SkDrawLooper::DrawContext* init(
+            SkCanvas*, void* storage, size_t storageSize) const SK_OVERRIDE;
 
     SK_DEVELOPER_TO_STRING()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkLayerDrawLooper)
 
 protected:
     SkLayerDrawLooper(SkReadBuffer&);
     virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
 
 private:
     struct Rec {
         Rec*    fNext;
         SkPaint fPaint;
         LayerInfo fInfo;
     };
     Rec*    fRecs;
     Rec*    fTopRec;
     int     fCount;
 
     // state-machine during the init/next cycle
-    Rec* fCurrRec;
+    class LayerDrawLooperContext : public SkDrawLooper::DrawContext {

[reed1, 2014/02/07 14:46:02]

Just for public brevity, can this definition be moved into the .cpp?

[Dominik Grewe, 2014/02/07 16:59:17]

If we move this definition out of the class scope we can't use private structs
such as 'Rec' any more.

+    public:
+        explicit LayerDrawLooperContext(const SkLayerDrawLooper* looper);
 
-    static void ApplyInfo(SkPaint* dst, const SkPaint& src, const LayerInfo&);
+    protected:
+        virtual bool next(SkCanvas*, SkPaint* paint) SK_OVERRIDE;
+
+    private:
+        Rec* fCurrRec;
+
+        static void ApplyInfo(SkPaint* dst, const SkPaint& src, const LayerInfo&);
+    };
 
     class MyRegistrar : public SkFlattenable::Registrar {
     public:
         MyRegistrar();
     };
 
     typedef SkDrawLooper INHERITED;
 };
 
 #endif