Update from https://crrev.com/312398

cc/layers/picture_image_layer_unittest.cc

Index: cc/layers/picture_image_layer_unittest.cc
diff --git a/cc/layers/picture_image_layer_unittest.cc b/cc/layers/picture_image_layer_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..acf691dece519efab5f5a6dcff9b214619cfdeda
--- /dev/null
+++ b/cc/layers/picture_image_layer_unittest.cc
@@ -0,0 +1,46 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "cc/layers/picture_image_layer.h"
+
+#include "cc/resources/display_item.h"
+#include "cc/test/skia_common.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkColor.h"
+
+namespace cc {
+namespace {
+
+TEST(PictureImageLayerTest, PaintContentsToDisplayList) {
+  scoped_refptr<PictureImageLayer> layer = PictureImageLayer::Create();
+  gfx::Rect layer_rect(200, 200);
+
+  SkBitmap image_bitmap;
+  unsigned char image_pixels[4 * 200 * 200] = {0};
+  SkImageInfo info =
+      SkImageInfo::MakeN32Premul(layer_rect.width(), layer_rect.height());
+  image_bitmap.installPixels(info, image_pixels, info.minRowBytes());
+  SkCanvas image_canvas(image_bitmap);
+  image_canvas.clear(SK_ColorRED);
+  SkPaint blue_paint;
+  blue_paint.setColor(SK_ColorBLUE);
+  image_canvas.drawRectCoords(0.f, 0.f, 100.f, 100.f, blue_paint);
+  image_canvas.drawRectCoords(100.f, 100.f, 200.f, 200.f, blue_paint);
+
+  layer->SetBitmap(image_bitmap);
+  layer->SetBounds(gfx::Size(layer_rect.width(), layer_rect.height()));
+
+  scoped_refptr<DisplayItemList> display_list =
+      layer->PaintContentsToDisplayList(
+          layer_rect, ContentLayerClient::GRAPHICS_CONTEXT_ENABLED);
+  unsigned char actual_pixels[4 * 200 * 200] = {0};
+  DrawDisplayList(actual_pixels, layer_rect, display_list);
+
+  EXPECT_EQ(0, memcmp(actual_pixels, image_pixels, 4 * 200 * 200));
+}
+
+}  // namespace
+}  // namespace cc