Remove cullRect() from PaintOpBuffer.

cc/paint/display_item_list.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/paint/display_item_list.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 80 matching lines @@
         canvas->saveLayer(bounds, &paint);
       else
         canvas->saveLayerPreserveLCDTextRequests(bounds, &paint);
       break;
     }
     case DisplayItem::END_COMPOSITING:
       canvas->restore();
       break;
     case DisplayItem::DRAWING: {
       const auto& item = static_cast<const DrawingDisplayItem&>(base_item);
-      if (canvas->quickReject(item.picture->cullRect()))
+      if (canvas->quickReject(item.bounds))
         break;
 
       // TODO(enne): Maybe the PaintRecord itself could know whether this
       // was needed?  It's not clear whether these save/restore semantics
       // that SkPicture handles during playback are things that should be
       // kept around.
       canvas->save();
       item.picture->playback(canvas, callback);
       canvas->restore();
       break;
@@ skipping 308 matching lines @@
           state->SetString("name", "DrawingDisplayItem");
 
           state->BeginArray("visualRect");
           state->AppendInteger(visual_rect.x());
           state->AppendInteger(visual_rect.y());
           state->AppendInteger(visual_rect.width());
           state->AppendInteger(visual_rect.height());
           state->EndArray();
 
           state->BeginArray("cullRect");
-          state->AppendInteger(item.picture->cullRect().x());
-          state->AppendInteger(item.picture->cullRect().y());
-          state->AppendInteger(item.picture->cullRect().width());
-          state->AppendInteger(item.picture->cullRect().height());
+          state->AppendInteger(item.bounds.x());
+          state->AppendInteger(item.bounds.y());
+          state->AppendInteger(item.bounds.width());
+          state->AppendInteger(item.bounds.height());
           state->EndArray();
 
           std::string b64_picture;
-          PictureDebugUtil::SerializeAsBase64(ToSkPicture(item.picture).get(),
-                                              &b64_picture);
+          PictureDebugUtil::SerializeAsBase64(
+              ToSkPicture(item.picture, item.bounds).get(), &b64_picture);
           state->SetString("skp64", b64_picture);
           state->EndDictionary();
           break;
         }
         case DisplayItem::FILTER: {
           const auto& item = static_cast<const FilterDisplayItem&>(base_item);
           state->AppendString(base::StringPrintf(
               "FilterDisplayItem bounds: [%s] visualRect: [%s]",
               item.bounds.ToString().c_str(), visual_rect.ToString().c_str()));
           break;
@@ skipping 90 matching lines @@
     std::vector<DrawImage>* images) {
   image_map_.GetDiscardableImagesInRect(rect, contents_scale,
                                         target_color_space, images);
 }
 
 gfx::Rect DisplayItemList::GetRectForImage(PaintImage::Id image_id) const {
   return image_map_.GetRectForImage(image_id);
 }
 
 }  // namespace cc