Revert of Remove cullRect() from PaintOpBuffer.

cc/paint/record_paint_canvas.cc

 // Copyright 2017 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/record_paint_canvas.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/paint/display_item_list.h"
 #include "cc/paint/paint_op_buffer.h"
 #include "cc/paint/paint_record.h"
 #include "cc/paint/paint_recorder.h"
 #include "third_party/skia/include/core/SkAnnotation.h"
 #include "third_party/skia/include/core/SkMetaData.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 
 namespace cc {
 
-RecordPaintCanvas::RecordPaintCanvas(PaintOpBuffer* buffer,
-                                     const SkRect& bounds)
-    : buffer_(buffer), recording_bounds_(bounds) {
+RecordPaintCanvas::RecordPaintCanvas(PaintOpBuffer* buffer) : buffer_(buffer) {
   DCHECK(buffer_);
 }
 
 RecordPaintCanvas::~RecordPaintCanvas() = default;
 
 SkMetaData& RecordPaintCanvas::getMetaData() {
   // This could just be SkMetaData owned by RecordPaintCanvas, but since
   // SkCanvas already has one, we might as well use it directly.
   return GetCanvas()->getMetaData();
 }
@@ skipping 316 matching lines @@
 }
 
 const SkNoDrawCanvas* RecordPaintCanvas::GetCanvas() const {
   return const_cast<RecordPaintCanvas*>(this)->GetCanvas();
 }
 
 SkNoDrawCanvas* RecordPaintCanvas::GetCanvas() {
   if (canvas_)
     return &*canvas_;
 
+  SkRect recording_bounds = buffer_->cullRect();
+
   // Size the canvas to be large enough to contain the |recording_bounds|, which
   // may not be positioned at th origin.
-  SkIRect enclosing_rect = recording_bounds_.roundOut();
+  SkIRect enclosing_rect = recording_bounds.roundOut();
   canvas_.emplace(enclosing_rect.right(), enclosing_rect.bottom());
 
   // This is part of the "recording canvases have a size, but why" dance.
   // By creating a canvas of size (right x bottom) and then clipping it,
   // It makes getDeviceClipBounds return the original cull rect, which code
   // in GraphicsContextCanvas on Mac expects.  (Just creating an SkNoDrawCanvas
-  // with the recording_bounds_ makes a canvas of size (width x height) instead
+  // with the cull_rect makes a canvas of size (width x height) instead
   // which is incorrect.  SkRecorder cheats with private resetForNextCanvas.
-  canvas_->clipRect(recording_bounds_, SkClipOp::kIntersect, false);
+  canvas_->clipRect(recording_bounds, SkClipOp::kIntersect, false);
   return &*canvas_;
 }
 
 }  // namespace cc