| Index: ui/compositor/layer.cc
|
| diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
|
| index 36d56f26ebb6644e024eb215bca060aa7d2f67fd..82996500068d10edf0d288c8dd05763df8c26d8d 100644
|
| --- a/ui/compositor/layer.cc
|
| +++ b/ui/compositor/layer.cc
|
| @@ -751,18 +751,17 @@ void Layer::RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request) {
|
| }
|
|
|
| scoped_refptr<cc::DisplayItemList> Layer::PaintContentsToDisplayList(
|
| - const gfx::Rect& clip,
|
| - ContentLayerClient::PaintingControlSetting painting_control) {
|
| + ContentLayerClient::PaintingControlSetting painting_control,
|
| + gfx::Rect* recording_viewport) {
|
| TRACE_EVENT1("ui", "Layer::PaintContentsToDisplayList", "name", name_);
|
| gfx::Rect local_bounds(bounds().size());
|
| gfx::Rect invalidation(
|
| gfx::IntersectRects(damaged_region_.bounds(), local_bounds));
|
| - DCHECK(clip.Contains(invalidation));
|
| ClearDamagedRects();
|
| cc::DisplayItemListSettings settings;
|
| settings.use_cached_picture = false;
|
| scoped_refptr<cc::DisplayItemList> display_list =
|
| - cc::DisplayItemList::Create(clip, settings);
|
| + cc::DisplayItemList::Create(*recording_viewport, settings);
|
| if (delegate_) {
|
| delegate_->OnPaintLayer(
|
| PaintContext(display_list.get(), device_scale_factor_, invalidation));
|
|
|