[WIP] Add Context to SkDrawLooper.

src/core/SkCanvas.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCanvas.h"
@@ skipping 337 matching lines @@
             SkPaint tmp;
             tmp.setImageFilter(fOrigPaint.getImageFilter());
             (void)canvas->internalSaveLayer(bounds, &tmp,
                                     SkCanvas::kARGB_ClipLayer_SaveFlag, true);
             // we'll clear the imageFilter for the actual draws in next(), so
             // it will only be applied during the restore().
             fDoClearImageFilter = true;
         }
 
         if (fLooper) {
-            fLooper->init(canvas);
+            fLooperContext = fLooper->init(canvas, &fLooperContextAllocator);
             fIsSimple = false;
         } else {
             // can we be marked as simple?
             fIsSimple = !fFilter && !fDoClearImageFilter;
         }
     }
 
     ~AutoDrawLooper() {
         if (fDoClearImageFilter) {
             fCanvas->internalRestore();
@@ skipping 15 matching lines @@
             return !fPaint->nothingToDraw();
         } else {
             return this->doNext(drawType);
         }
     }
 
 private:
     SkLazyPaint     fLazyPaint;
     SkCanvas*       fCanvas;
     const SkPaint&  fOrigPaint;
     SkDrawLooper*   fLooper;

[scroggo, 2014/03/10 19:41:32]

After initialization, fLooper is only used to check if it's NULL. If it's NULL,
fLooperContext is also NULL. Can we drop fLooper and check against
fLooperContext?

[Dominik Grewe, 2014/03/11 11:53:54]

Done.

     SkDrawFilter*   fFilter;
     const SkPaint*  fPaint;
     int             fSaveCount;
     bool            fDoClearImageFilter;
     bool            fDone;
     bool            fIsSimple;
+    SkDrawLooper::Context* fLooperContext;
+    SkDrawLooper::ContextAllocator fLooperContextAllocator;
 
     bool doNext(SkDrawFilter::Type drawType);
 };
 
 bool AutoDrawLooper::doNext(SkDrawFilter::Type drawType) {
     fPaint = NULL;
     SkASSERT(!fIsSimple);
     SkASSERT(fLooper || fFilter || fDoClearImageFilter);
+    SkASSERT(!fLooper || fLooperContext);
 
     SkPaint* paint = fLazyPaint.set(fOrigPaint);
 
     if (fDoClearImageFilter) {
         paint->setImageFilter(NULL);
     }
 
-    if (fLooper && !fLooper->next(fCanvas, paint)) {
+    if (fLooper && !fLooperContext->next(fCanvas, paint)) {
         fDone = true;
         return false;
     }
     if (fFilter) {
         if (!fFilter->filter(paint, drawType)) {
             fDone = true;
             return false;
         }
         if (NULL == fLooper) {
             // no looper means we only draw once
@@ skipping 2024 matching lines @@
     if (!bitmap.allocPixels(info)) {
         return NULL;
     }
 
     // should this functionality be moved into allocPixels()?
     if (!bitmap.info().isOpaque()) {
         bitmap.eraseColor(0);
     }
     return SkNEW_ARGS(SkCanvas, (bitmap));
 }