Rename DisplayItemList to PaintController

third_party/WebKit/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
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "platform/graphics/GraphicsContext.h"
 
 #include "platform/graphics/BitmapImage.h"
-#include "platform/graphics/paint/DisplayItemList.h"
+#include "platform/graphics/paint/PaintController.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkShader.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 #define EXPECT_EQ_RECT(a, b) \
     EXPECT_EQ(a.x(), b.x()); \
@@ skipping 22 matching lines @@
         } \
 }
 
 TEST(GraphicsContextTest, pictureRecording)
 {
     SkBitmap bitmap;
     bitmap.allocN32Pixels(100, 100);
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
-    OwnPtr<DisplayItemList> displayItemList = DisplayItemList::create();
-    GraphicsContext context(displayItemList.get());
+    OwnPtr<PaintController> paintController = PaintController::create();
+    GraphicsContext context(paintController.get());
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     FloatRect bounds(0, 0, 100, 100);
 
     context.beginRecording(bounds);
     context.fillRect(FloatRect(0, 0, 50, 50), opaque, SkXfermode::kSrcOver_Mode);
     RefPtr<const SkPicture> picture = context.endRecording();
     canvas.drawPicture(picture.get());
     EXPECT_OPAQUE_PIXELS_ONLY_IN_RECT(bitmap, IntRect(0, 0, 50, 50))
 
@@ skipping 11 matching lines @@
 {
     SkBitmap bitmap;
     bitmap.allocN32Pixels(400, 400);
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
     Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
     Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
     FloatRect bounds(0, 0, 100, 100);
 
-    OwnPtr<DisplayItemList> displayItemList = DisplayItemList::create();
-    GraphicsContext context(displayItemList.get());
+    OwnPtr<PaintController> paintController = PaintController::create();
+    GraphicsContext context(paintController.get());
     context.beginRecording(bounds);
 
     context.setShouldAntialias(false);
     context.setMiterLimit(1);
     context.setStrokeThickness(5);
     context.setLineCap(SquareCap);
     context.setStrokeStyle(SolidStroke);
 
     // Make skia unable to compute fast bounds for our paths.
     DashArray dashArray;
@@ skipping 19 matching lines @@
     paint.setColor(alpha.rgb());
     paint.setXfermodeMode(SkXfermode::kSrcOut_Mode);
     context.drawPath(path.skPath(), paint);
 
     picture = context.endRecording();
     canvas.drawPicture(picture.get());
     EXPECT_OPAQUE_PIXELS_IN_RECT(bitmap, IntRect(20, 10, 30, 40));
 }
 
 } // namespace blink