[WIP] Add Context to SkDrawLooper.

tests/LayerDrawLooperTest.cpp

Index: tests/LayerDrawLooperTest.cpp
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index 68dd5e06e7bbbafdd5bd6ddf637841a8a8401f8f..8b5cbe7be1235e128b1672c7353ab8404735ca8e 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -57,10 +57,11 @@ static void test_frontToBack(skiatest::Reporter* reporter) {
     SkCanvas canvas(&device);
     SkPaint paint;
     SkAutoTUnref<SkLayerDrawLooper> looper(looperBuilder.detachLooper());
-    looper->init(&canvas);
+    SkDrawLooper::ContextAllocator allocator;
+    SkDrawLooper::Context* context = looper->init(&canvas, &allocator);
 
     // The back layer should come first.
-    REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
+    REPORTER_ASSERT(reporter, context->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode));
     canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
     REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX());
@@ -68,14 +69,14 @@ static void test_frontToBack(skiatest::Reporter* reporter) {
     paint.reset();
 
     // Then the front layer.
-    REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
+    REPORTER_ASSERT(reporter, context->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode));
     canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
     REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX());
     REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateY());
 
     // Only two layers were added, so that should be the end.
-    REPORTER_ASSERT(reporter, !looper->next(&canvas, &paint));
+    REPORTER_ASSERT(reporter, !context->next(&canvas, &paint));
 }
 
 static void test_backToFront(skiatest::Reporter* reporter) {
@@ -95,10 +96,11 @@ static void test_backToFront(skiatest::Reporter* reporter) {
     SkCanvas canvas(&device);
     SkPaint paint;
     SkAutoTUnref<SkLayerDrawLooper> looper(looperBuilder.detachLooper());
-    looper->init(&canvas);
+    SkDrawLooper::ContextAllocator allocator;
+    SkDrawLooper::Context* context = looper->init(&canvas, &allocator);
 
     // The back layer should come first.
-    REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
+    REPORTER_ASSERT(reporter, context->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode));
     canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
     REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX());
@@ -106,14 +108,14 @@ static void test_backToFront(skiatest::Reporter* reporter) {
     paint.reset();
 
     // Then the front layer.
-    REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
+    REPORTER_ASSERT(reporter, context->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode));
     canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
     REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX());
     REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY());
 
     // Only two layers were added, so that should be the end.
-    REPORTER_ASSERT(reporter, !looper->next(&canvas, &paint));
+    REPORTER_ASSERT(reporter, !context->next(&canvas, &paint));
 }
 
 static void test_mixed(skiatest::Reporter* reporter) {
@@ -133,10 +135,11 @@ static void test_mixed(skiatest::Reporter* reporter) {
     SkCanvas canvas(&device);
     SkPaint paint;
     SkAutoTUnref<SkLayerDrawLooper> looper(looperBuilder.detachLooper());
-    looper->init(&canvas);
+    SkDrawLooper::ContextAllocator allocator;
+    SkDrawLooper::Context* context = looper->init(&canvas, &allocator);
 
     // The back layer should come first.
-    REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
+    REPORTER_ASSERT(reporter, context->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode));
     canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
     REPORTER_ASSERT(reporter, 0.0f == device.fLastMatrix.getTranslateX());
@@ -144,14 +147,14 @@ static void test_mixed(skiatest::Reporter* reporter) {
     paint.reset();
 
     // Then the front layer.
-    REPORTER_ASSERT(reporter, looper->next(&canvas, &paint));
+    REPORTER_ASSERT(reporter, context->next(&canvas, &paint));
     REPORTER_ASSERT(reporter, SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrc_Mode));
     canvas.drawRect(SkRect::MakeWH(50.0f, 50.0f), paint);
     REPORTER_ASSERT(reporter, 10.0f == device.fLastMatrix.getTranslateX());
     REPORTER_ASSERT(reporter, 20.0f == device.fLastMatrix.getTranslateY());
 
     // Only two layers were added, so that should be the end.
-    REPORTER_ASSERT(reporter, !looper->next(&canvas, &paint));
+    REPORTER_ASSERT(reporter, !context->next(&canvas, &paint));
 }
 
 DEF_TEST(LayerDrawLooper, reporter) {