Remove the clip parameter from ContentLayerClient.

cc/test/fake_content_layer_client.cc

 // Copyright 2012 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/test/fake_content_layer_client.h"
 
 #include "cc/playback/clip_display_item.h"
 #include "cc/playback/display_item_list_settings.h"
 #include "cc/playback/drawing_display_item.h"
 #include "cc/playback/transform_display_item.h"
@@ skipping 25 matching lines @@
 FakeContentLayerClient::~FakeContentLayerClient() {
 }
 
 gfx::Rect FakeContentLayerClient::PaintableRegion() {
   CHECK(bounds_set_);
   return gfx::Rect(bounds_);
 }
 
 scoped_refptr<DisplayItemList>
 FakeContentLayerClient::PaintContentsToDisplayList(
-    const gfx::Rect& clip,
     PaintingControlSetting painting_control) {
   // Cached picture is used because unit tests expect to be able to
   // use GatherPixelRefs.
   DisplayItemListSettings settings;
   settings.use_cached_picture = true;
   scoped_refptr<DisplayItemList> display_list =
-      DisplayItemList::Create(clip, settings);
+      DisplayItemList::Create(PaintableRegion(), settings);
   SkPictureRecorder recorder;
   skia::RefPtr<SkCanvas> canvas;
   skia::RefPtr<SkPicture> picture;
-  auto* item = display_list->CreateAndAppendItem<ClipDisplayItem>(clip);
-  item->SetNew(clip, std::vector<SkRRect>());
+  auto* item =
+      display_list->CreateAndAppendItem<ClipDisplayItem>(PaintableRegion());
+  item->SetNew(PaintableRegion(), std::vector<SkRRect>());

[enne (OOO), 2015/12/01 22:43:16]

I think you should either not append a clip item at all, or you should append a
clip to the valid painted bounds (or maybe Blink should?)

[enne (OOO), 2015/12/01 22:46:25]

Oops, I guess this is in a test.  So, probably it should go away?

[chrishtr, 2015/12/01 23:01:20]

Removed.

 
   for (RectPaintVector::const_iterator it = draw_rects_.begin();
        it != draw_rects_.end(); ++it) {
     const gfx::RectF& draw_rect = it->first;
     const SkPaint& paint = it->second;
     canvas =
         skia::SharePtr(recorder.beginRecording(gfx::RectFToSkRect(draw_rect)));
     canvas->drawRect(gfx::RectFToSkRect(draw_rect), paint);
     picture = skia::AdoptRef(recorder.endRecordingAsPicture());
     auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>(
         ToEnclosingRect(draw_rect));
     item->SetNew(std::move(picture));
   }
 
   for (ImageVector::const_iterator it = draw_images_.begin();
        it != draw_images_.end(); ++it) {
     if (!it->transform.IsIdentity()) {
-      auto* item =
-          display_list->CreateAndAppendItem<TransformDisplayItem>(clip);
+      auto* item = display_list->CreateAndAppendItem<TransformDisplayItem>(
+          PaintableRegion());
       item->SetNew(it->transform);
     }
     canvas = skia::SharePtr(
         recorder.beginRecording(it->image->width(), it->image->height()));
     canvas->drawImage(it->image.get(), it->point.x(), it->point.y(),
                       &it->paint);
     picture = skia::AdoptRef(recorder.endRecordingAsPicture());
-    auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>(clip);
+    auto* item = display_list->CreateAndAppendItem<DrawingDisplayItem>(
+        PaintableRegion());
     item->SetNew(std::move(picture));
     if (!it->transform.IsIdentity()) {
-      display_list->CreateAndAppendItem<EndTransformDisplayItem>(clip);
+      display_list->CreateAndAppendItem<EndTransformDisplayItem>(
+          PaintableRegion());
     }
   }
 
   if (fill_with_nonsolid_color_) {
-    gfx::Rect draw_rect = clip;
+    gfx::Rect draw_rect = PaintableRegion();
     bool red = true;
     while (!draw_rect.IsEmpty()) {
       SkPaint paint;
       paint.setColor(red ? SK_ColorRED : SK_ColorBLUE);
       canvas =
           skia::SharePtr(recorder.beginRecording(gfx::RectToSkRect(draw_rect)));
       canvas->drawIRect(gfx::RectToSkIRect(draw_rect), paint);
       picture = skia::AdoptRef(recorder.endRecordingAsPicture());
       auto* item =
           display_list->CreateAndAppendItem<DrawingDisplayItem>(draw_rect);
       item->SetNew(std::move(picture));
       draw_rect.Inset(1, 1);
     }
   }
 
-  display_list->CreateAndAppendItem<EndClipDisplayItem>(clip);
+  display_list->CreateAndAppendItem<EndClipDisplayItem>(PaintableRegion());
 
   display_list->Finalize();
   return display_list;
 }
 
 bool FakeContentLayerClient::FillsBoundsCompletely() const { return false; }
 
 size_t FakeContentLayerClient::GetApproximateUnsharedMemoryUsage() const {
   return reported_memory_usage_;
 }
 
 }  // namespace cc