| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/compositor/layer.h" | 5 #include "ui/compositor/layer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 755 scoped_refptr<cc::DisplayItemList> Layer::PaintContentsToDisplayList( | 755 scoped_refptr<cc::DisplayItemList> Layer::PaintContentsToDisplayList( |
| 756 ContentLayerClient::PaintingControlSetting painting_control) { | 756 ContentLayerClient::PaintingControlSetting painting_control) { |
| 757 TRACE_EVENT1("ui", "Layer::PaintContentsToDisplayList", "name", name_); | 757 TRACE_EVENT1("ui", "Layer::PaintContentsToDisplayList", "name", name_); |
| 758 gfx::Rect local_bounds(bounds().size()); | 758 gfx::Rect local_bounds(bounds().size()); |
| 759 gfx::Rect invalidation( | 759 gfx::Rect invalidation( |
| 760 gfx::IntersectRects(paint_region_.bounds(), local_bounds)); | 760 gfx::IntersectRects(paint_region_.bounds(), local_bounds)); |
| 761 paint_region_.Clear(); | 761 paint_region_.Clear(); |
| 762 cc::DisplayItemListSettings settings; | 762 cc::DisplayItemListSettings settings; |
| 763 settings.use_cached_picture = false; | 763 settings.use_cached_picture = false; |
| 764 scoped_refptr<cc::DisplayItemList> display_list = | 764 scoped_refptr<cc::DisplayItemList> display_list = |
| 765 cc::DisplayItemList::Create(PaintableRegion(), settings); | 765 cc::DisplayItemList::Create(settings); |
| 766 if (delegate_) { | 766 if (delegate_) { |
| 767 delegate_->OnPaintLayer( | 767 delegate_->OnPaintLayer( |
| 768 PaintContext(display_list.get(), device_scale_factor_, invalidation)); | 768 PaintContext(display_list.get(), device_scale_factor_, invalidation)); |
| 769 } | 769 } |
| 770 display_list->Finalize(); | 770 display_list->Finalize(); |
| 771 return display_list; | 771 return display_list; |
| 772 } | 772 } |
| 773 | 773 |
| 774 bool Layer::FillsBoundsCompletely() const { return fills_bounds_completely_; } | 774 bool Layer::FillsBoundsCompletely() const { return fills_bounds_completely_; } |
| 775 | 775 |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1051 if (animator_) { | 1051 if (animator_) { |
| 1052 animator_->ResetCompositor(compositor); | 1052 animator_->ResetCompositor(compositor); |
| 1053 animator_->RemoveFromCollection(collection); | 1053 animator_->RemoveFromCollection(collection); |
| 1054 } | 1054 } |
| 1055 | 1055 |
| 1056 for (auto* child : children_) | 1056 for (auto* child : children_) |
| 1057 child->ResetCompositorForAnimatorsInTree(compositor); | 1057 child->ResetCompositorForAnimatorsInTree(compositor); |
| 1058 } | 1058 } |
| 1059 | 1059 |
| 1060 } // namespace ui | 1060 } // namespace ui |
| OLD | NEW |