cc: Restore GPU suitability check in cached_picture case.

cc/playback/display_item_list_unittest.cc

 // Copyright 2014 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/playback/display_item_list.h"
 
 #include <vector>
 
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
@@ skipping 509 matching lines @@
   path.lineTo(0, 100);
   path.lineTo(50, 50);
   path.lineTo(100, 100);
   path.lineTo(100, 0);
   path.close();
 
   SkPaint paint;
   paint.setAntiAlias(true);
   canvas->drawPath(path, paint);
 
-  list->CreateAndAppendItem<DrawingDisplayItem>(
-      kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture()));
+  skia::RefPtr<SkPicture> suitable_picture =
+      skia::AdoptRef(recorder.endRecordingAsPicture());
+  list->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect, suitable_picture);
   list->Finalize();
 
   // A single DrawingDisplayItem with a large AA concave path shouldn't trigger
   // a veto.
   EXPECT_TRUE(list->IsSuitableForGpuRasterization());
 
+  // Now check the RasterIntoCanvas path.
+  list = DisplayItemList::Create(layer_rect, settings);
+  DrawingDisplayItem suitable_item(suitable_picture);
+  list->RasterIntoCanvas(suitable_item);
+  list->Finalize();
+  EXPECT_TRUE(list->IsSuitableForGpuRasterization());
+
   list = DisplayItemList::Create(layer_rect, settings);
   canvas =
       skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(layer_rect)));
   for (int i = 0; i < 10; ++i)
     canvas->drawPath(path, paint);
-  list->CreateAndAppendItem<DrawingDisplayItem>(
-      kVisualRect, skia::AdoptRef(recorder.endRecordingAsPicture()));
+  skia::RefPtr<SkPicture> unsuitable_picture =
+      skia::AdoptRef(recorder.endRecordingAsPicture());
+  list->CreateAndAppendItem<DrawingDisplayItem>(kVisualRect,
+                                                unsuitable_picture);
   list->Finalize();
 
   // A single DrawingDisplayItem with several large AA concave paths should
   // trigger a veto.
   EXPECT_FALSE(list->IsSuitableForGpuRasterization());
+
+  // Now check the RasterIntoCanvas path.
+  list = DisplayItemList::Create(layer_rect, settings);
+  DrawingDisplayItem unsuitable_item(unsuitable_picture);
+  list->RasterIntoCanvas(unsuitable_item);
+  list->Finalize();
+  EXPECT_FALSE(list->IsSuitableForGpuRasterization());
 }
 
 TEST(DisplayItemListTest, IsSuitableForGpuRasterizationWithoutCachedPicture) {
   gfx::Rect layer_rect(1000, 1000);
   SkPictureRecorder recorder;
   skia::RefPtr<SkCanvas> canvas;
   skia::RefPtr<SkPicture> picture;
 
   DisplayItemListSettings settings;
   settings.use_cached_picture = false;
@@ skipping 174 matching lines @@
 
   value = list->AsValue(false)->ToString();
   EXPECT_EQ(value.find("\"items\":"), std::string::npos);
   EXPECT_NE(value.find("\"layer_rect\":[0,0,0,0]"), std::string::npos);
   // There should be no skp64 entry present as the items aren't included and the
   // layer rect is empty.
   EXPECT_EQ(value.find("\"skp64\":"), std::string::npos);
 }
 
 }  // namespace cc