Modifications to DisplayList for better Slimming Paint

Source/platform/graphics/GraphicsContextTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 1117 matching lines @@
     SkCanvas canvas(bitmap);
     GraphicsContext context(&canvas);
 
     SkCanvas controlCanvas(400, 400);
     GraphicsContext controlContext(&controlCanvas);
 
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
     DISPATCH2(context, controlContext, scale, 2, 2);
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
+    RefPtr<DisplayList> displayList1 = DisplayList::create(FloatRect(0, 0, 200, 200));
     controlContext.save();
-    context.beginRecording(FloatRect(0, 0, 200, 200));
+    context.beginRecording(displayList1);
     DISPATCH2(context, controlContext, translate, 10, 10);
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
+    RefPtr<DisplayList> displayList2 = DisplayList::create(FloatRect(10, 10, 100, 100));
     controlContext.save();
-    context.beginRecording(FloatRect(10, 10, 100, 100));
+    context.beginRecording(displayList2);
     DISPATCH1(context, controlContext, rotate, 45);
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.restore();
     context.endRecording();
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 
     controlContext.restore();
     context.endRecording();
     EXPECT_EQ(context.getCTM(), controlContext.getCTM());
 }
 
 TEST(GraphicsContextTest, DisplayList)
 {
+    SkBitmap bitmap;
+    ASSERT_TRUE(bitmap.allocN32Pixels(1, 1));
+    bitmap.eraseColor(0);
+    SkCanvas canvas(bitmap);
+    GraphicsContext context(&canvas);
+
     FloatRect rect(0, 0, 1, 1);
-    RefPtr<DisplayList> dl = adoptRef(new DisplayList(rect));
+    RefPtr<DisplayList> dl = DisplayList::create(rect);
 
     // picture() returns 0 initially
     SkPicture* pic = dl->picture();
     EXPECT_FALSE(pic);
 
-    // endRecording without a beginRecording does nothing
-    dl->endRecording();
-    pic = dl->picture();
-    EXPECT_FALSE(pic);
-
     // Two beginRecordings in a row generate two canvases.
     // Unfortunately the new one could be allocated in the same
     // spot as the old one so ref the first one to prolong its life.
-    IntSize size(1, 1);
-    SkCanvas* canvas1 = dl->beginRecording(size);
+    context.beginRecording(dl);
+    SkCanvas* canvas1 = context.canvas();
     EXPECT_TRUE(canvas1);
-    canvas1->ref();
-    SkCanvas* canvas2 = dl->beginRecording(size);
+    context.beginRecording(dl);
+    SkCanvas* canvas2 = context.canvas();
     EXPECT_TRUE(canvas2);
 
     EXPECT_NE(canvas1, canvas2);
     EXPECT_EQ(1, canvas1->getRefCnt());
-    canvas1->unref();
-
-    EXPECT_TRUE(dl->isRecording());
 
     // picture() returns 0 during recording
     pic = dl->picture();
     EXPECT_FALSE(pic);
 
     // endRecording finally makes the picture accessible
-    dl->endRecording();
+    context.endRecording();
     pic = dl->picture();
     EXPECT_TRUE(pic);
     EXPECT_EQ(1, pic->getRefCnt());
+
+    context.endRecording();
 }
 
 } // namespace