| 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 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 830 delegate_->OnDelegatedFrameDamage(damage_rect_in_dip); | 830 delegate_->OnDelegatedFrameDamage(damage_rect_in_dip); |
| 831 } | 831 } |
| 832 | 832 |
| 833 void Layer::SetScrollable(Layer* parent_clip_layer, | 833 void Layer::SetScrollable(Layer* parent_clip_layer, |
| 834 const base::Closure& on_scroll) { | 834 const base::Closure& on_scroll) { |
| 835 cc_layer_->SetScrollClipLayerId(parent_clip_layer->cc_layer_->id()); | 835 cc_layer_->SetScrollClipLayerId(parent_clip_layer->cc_layer_->id()); |
| 836 cc_layer_->set_did_scroll_callback(on_scroll); | 836 cc_layer_->set_did_scroll_callback(on_scroll); |
| 837 cc_layer_->SetUserScrollable(true, true); | 837 cc_layer_->SetUserScrollable(true, true); |
| 838 } | 838 } |
| 839 | 839 |
| 840 cc::ElementId Layer::GetElementId() const { |
| 841 return cc_layer_->element_id(); |
| 842 } |
| 843 |
| 840 gfx::ScrollOffset Layer::CurrentScrollOffset() const { | 844 gfx::ScrollOffset Layer::CurrentScrollOffset() const { |
| 841 const Compositor* compositor = GetCompositor(); | 845 const Compositor* compositor = GetCompositor(); |
| 842 gfx::ScrollOffset offset; | 846 gfx::ScrollOffset offset; |
| 843 if (compositor && | 847 if (compositor && |
| 844 compositor->GetScrollOffsetForLayer(cc_layer_->id(), &offset)) | 848 compositor->GetScrollOffsetForLayer(cc_layer_->id(), &offset)) |
| 845 return offset; | 849 return offset; |
| 846 return cc_layer_->scroll_offset(); | 850 return cc_layer_->scroll_offset(); |
| 847 } | 851 } |
| 848 | 852 |
| 849 void Layer::SetScrollOffset(const gfx::ScrollOffset& offset) { | 853 void Layer::SetScrollOffset(const gfx::ScrollOffset& offset) { |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1175 const auto it = std::find_if(mirrors_.begin(), mirrors_.end(), | 1179 const auto it = std::find_if(mirrors_.begin(), mirrors_.end(), |
| 1176 [mirror](const std::unique_ptr<LayerMirror>& mirror_ptr) { | 1180 [mirror](const std::unique_ptr<LayerMirror>& mirror_ptr) { |
| 1177 return mirror_ptr.get() == mirror; | 1181 return mirror_ptr.get() == mirror; |
| 1178 }); | 1182 }); |
| 1179 | 1183 |
| 1180 DCHECK(it != mirrors_.end()); | 1184 DCHECK(it != mirrors_.end()); |
| 1181 mirrors_.erase(it); | 1185 mirrors_.erase(it); |
| 1182 } | 1186 } |
| 1183 | 1187 |
| 1184 } // namespace ui | 1188 } // namespace ui |
| OLD | NEW |