| 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 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 743 DCHECK(delegated_renderer_layer_.get() || surface_layer_.get()); | 743 DCHECK(delegated_renderer_layer_.get() || surface_layer_.get()); |
| 744 if (!delegate_) | 744 if (!delegate_) |
| 745 return; | 745 return; |
| 746 delegate_->OnDelegatedFrameDamage(damage_rect_in_dip); | 746 delegate_->OnDelegatedFrameDamage(damage_rect_in_dip); |
| 747 } | 747 } |
| 748 | 748 |
| 749 void Layer::RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request) { | 749 void Layer::RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request) { |
| 750 cc_layer_->RequestCopyOfOutput(request.Pass()); | 750 cc_layer_->RequestCopyOfOutput(request.Pass()); |
| 751 } | 751 } |
| 752 | 752 |
| 753 void Layer::PaintContents( | |
| 754 SkCanvas* sk_canvas, | |
| 755 const gfx::Rect& clip, | |
| 756 ContentLayerClient::PaintingControlSetting painting_control) { | |
| 757 // The old non-slimming paint path is not used in ui::Compositor. | |
| 758 NOTREACHED(); | |
| 759 } | |
| 760 | |
| 761 scoped_refptr<cc::DisplayItemList> Layer::PaintContentsToDisplayList( | 753 scoped_refptr<cc::DisplayItemList> Layer::PaintContentsToDisplayList( |
| 762 const gfx::Rect& clip, | 754 const gfx::Rect& clip, |
| 763 ContentLayerClient::PaintingControlSetting painting_control) { | 755 ContentLayerClient::PaintingControlSetting painting_control) { |
| 764 TRACE_EVENT1("ui", "Layer::PaintContentsToDisplayList", "name", name_); | 756 TRACE_EVENT1("ui", "Layer::PaintContentsToDisplayList", "name", name_); |
| 765 gfx::Rect local_bounds(bounds().size()); | 757 gfx::Rect local_bounds(bounds().size()); |
| 766 gfx::Rect invalidation( | 758 gfx::Rect invalidation( |
| 767 gfx::IntersectRects(damaged_region_.bounds(), local_bounds)); | 759 gfx::IntersectRects(damaged_region_.bounds(), local_bounds)); |
| 768 DCHECK(clip.Contains(invalidation)); | 760 DCHECK(clip.Contains(invalidation)); |
| 769 ClearDamagedRects(); | 761 ClearDamagedRects(); |
| 770 cc::DisplayItemListSettings settings; | 762 cc::DisplayItemListSettings settings; |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1106 children_.end(), | 1098 children_.end(), |
| 1107 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), | 1099 std::bind2nd(std::mem_fun(&Layer::RemoveAnimatorsInTreeFromCollection), |
| 1108 collection)); | 1100 collection)); |
| 1109 } | 1101 } |
| 1110 | 1102 |
| 1111 bool Layer::IsAnimating() const { | 1103 bool Layer::IsAnimating() const { |
| 1112 return animator_.get() && animator_->is_animating(); | 1104 return animator_.get() && animator_->is_animating(); |
| 1113 } | 1105 } |
| 1114 | 1106 |
| 1115 } // namespace ui | 1107 } // namespace ui |
| OLD | NEW |