Update from chromium https://crrev.com/304586

cc/resources/picture_pile_impl_unittest.cc

 // Copyright 2013 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 "base/memory/scoped_ptr.h"
 #include "cc/test/fake_picture_pile_impl.h"
 #include "cc/test/skia_common.h"
 #include "skia/ext/refptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
@@ skipping 616 matching lines @@
     EXPECT_TRUE(iterator);
     EXPECT_TRUE(*iterator == discardable_bitmap[0][0].pixelRef());
     EXPECT_TRUE(++iterator);
     EXPECT_TRUE(*iterator == discardable_bitmap[0][1].pixelRef());
     EXPECT_TRUE(++iterator);
     EXPECT_TRUE(*iterator == discardable_bitmap[1][1].pixelRef());
     EXPECT_FALSE(++iterator);
   }
 }
 
-class FullContentsTest : public ::testing::TestWithParam<bool> {};
-
-TEST_P(FullContentsTest, RasterFullContents) {
+TEST(PicturePileImplTest, RasterFullContents) {
   gfx::Size tile_size(1000, 1000);
   gfx::Size layer_bounds(3, 5);
   float contents_scale = 1.5f;
   float raster_divisions = 2.f;
-  // Param in this case is whether the content is fully opaque
-  // or just filled completely. For this test they should behave the same.
-  bool contents_opaque = GetParam();
-  bool fills_content = !GetParam();
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
   // Because the caller sets content opaque, it also promises that it
   // has at least filled in layer_bounds opaquely.
   SkPaint white_paint;
   white_paint.setColor(SK_ColorWHITE);
   pile->add_draw_rect_with_paint(gfx::Rect(layer_bounds), white_paint);
 
   pile->SetMinContentsScale(contents_scale);
   pile->set_background_color(SK_ColorBLACK);
-  pile->set_contents_opaque(contents_opaque);
-  pile->set_contents_fill_bounds_completely(fills_content);
+  pile->SetRequiresClear(false);
   pile->set_clear_canvas_with_debug_color(false);
   pile->RerecordPile();
 
   gfx::Size content_bounds(
       gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
 
   // Simulate drawing into different tiles at different offsets.
   int step_x = std::ceil(content_bounds.width() / raster_divisions);
   int step_y = std::ceil(content_bounds.height() / raster_divisions);
   for (int offset_x = 0; offset_x < content_bounds.width();
@@ skipping 27 matching lines @@
       }
 
       // If the canvas doesn't extend past the edge of the content,
       // it should be entirely white. Otherwise, the edge of the content
       // will be non-white.
       EXPECT_EQ(all_white, gfx::Rect(content_bounds).Contains(canvas_rect));
     }
   }
 }
 
-INSTANTIATE_TEST_CASE_P(PicturePileImpl,
-                        FullContentsTest,
-                        ::testing::Values(false, true));
-
 TEST(PicturePileImpl, RasterContentsTransparent) {
   gfx::Size tile_size(1000, 1000);
   gfx::Size layer_bounds(5, 3);
   float contents_scale = 0.5f;
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
   pile->set_background_color(SK_ColorTRANSPARENT);
-  pile->set_contents_opaque(false);
+  pile->SetRequiresClear(true);
   pile->SetMinContentsScale(contents_scale);
   pile->set_clear_canvas_with_debug_color(false);
   pile->RerecordPile();
 
   gfx::Size content_bounds(
       gfx::ToCeiledSize(gfx::ScaleSize(layer_bounds, contents_scale)));
 
   gfx::Rect canvas_rect(content_bounds);
   canvas_rect.Inset(0, 0, -1, -1);
 
@@ skipping 19 matching lines @@
   gfx::Size tile_size(10, 10);
   gfx::Size layer_bounds(30, 30);
   gfx::Size bigger_than_layer_bounds(300, 300);
   float contents_scale = GetParam();
   // Pick an opaque color to not have to deal with premultiplication off-by-one.
   SkColor test_color = SkColorSetARGB(255, 45, 56, 67);
 
   scoped_refptr<FakePicturePileImpl> pile =
       FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
   pile->set_background_color(SK_ColorTRANSPARENT);
-  pile->set_contents_opaque(false);
+  pile->SetRequiresClear(true);
   pile->SetMinContentsScale(MinContentsScale());
   pile->set_clear_canvas_with_debug_color(true);
   SkPaint color_paint;
   color_paint.setColor(test_color);
   // Additive paint, so that if two paints overlap, the color will change.
   color_paint.setXfermodeMode(SkXfermode::kPlus_Mode);
   // Paint outside the layer to make sure that blending works.
   pile->add_draw_rect_with_paint(gfx::RectF(bigger_than_layer_bounds),
                                  color_paint);
   pile->RerecordPile();
@@ skipping 101 matching lines @@
     EXPECT_TRUE(iterator);
     EXPECT_TRUE(*iterator == discardable_bitmap[1].pixelRef());
     EXPECT_TRUE(++iterator);
     EXPECT_TRUE(*iterator == discardable_bitmap[2].pixelRef());
     EXPECT_FALSE(++iterator);
   }
 }
 
 }  // namespace
 }  // namespace cc