OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "cc/layers/layer_impl.h" | 5 #include "cc/layers/layer_impl.h" |
6 | 6 |
7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
8 #include "base/numerics/safe_conversions.h" | 8 #include "base/numerics/safe_conversions.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
(...skipping 1279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1290 | 1290 |
1291 void LayerImpl::SetUpdateRect(const gfx::Rect& update_rect) { | 1291 void LayerImpl::SetUpdateRect(const gfx::Rect& update_rect) { |
1292 update_rect_ = update_rect; | 1292 update_rect_ = update_rect; |
1293 SetNeedsPushProperties(); | 1293 SetNeedsPushProperties(); |
1294 } | 1294 } |
1295 | 1295 |
1296 void LayerImpl::AddDamageRect(const gfx::RectF& damage_rect) { | 1296 void LayerImpl::AddDamageRect(const gfx::RectF& damage_rect) { |
1297 damage_rect_ = gfx::UnionRects(damage_rect_, damage_rect); | 1297 damage_rect_ = gfx::UnionRects(damage_rect_, damage_rect); |
1298 } | 1298 } |
1299 | 1299 |
1300 bool LayerImpl::IsExternalScrollActive() const { | |
1301 return layer_tree_impl_->IsExternalScrollActive(); | |
1302 } | |
1303 | |
1304 void LayerImpl::SetCurrentScrollOffset(const gfx::ScrollOffset& scroll_offset) { | 1300 void LayerImpl::SetCurrentScrollOffset(const gfx::ScrollOffset& scroll_offset) { |
1305 DCHECK(IsActive()); | 1301 DCHECK(IsActive()); |
1306 if (scroll_offset_->SetCurrent(scroll_offset)) | 1302 if (scroll_offset_->SetCurrent(scroll_offset)) |
1307 DidUpdateScrollOffset(false); | 1303 DidUpdateScrollOffset(false); |
1308 } | 1304 } |
1309 | 1305 |
1310 void LayerImpl::SetCurrentScrollOffsetFromDelegate( | 1306 void LayerImpl::SetCurrentScrollOffsetFromDelegate( |
1311 const gfx::ScrollOffset& scroll_offset) { | 1307 const gfx::ScrollOffset& scroll_offset) { |
1312 DCHECK(IsActive()); | 1308 DCHECK(IsActive()); |
1313 if (scroll_offset_->SetCurrent(scroll_offset)) | 1309 if (scroll_offset_->SetCurrent(scroll_offset)) |
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1849 } | 1845 } |
1850 | 1846 |
1851 // TODO(enne): the transform needs to come from property trees instead of | 1847 // TODO(enne): the transform needs to come from property trees instead of |
1852 // draw properties. | 1848 // draw properties. |
1853 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( | 1849 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( |
1854 draw_properties().target_space_transform, default_scale); | 1850 draw_properties().target_space_transform, default_scale); |
1855 return std::max(transform_scales.x(), transform_scales.y()); | 1851 return std::max(transform_scales.x(), transform_scales.y()); |
1856 } | 1852 } |
1857 | 1853 |
1858 } // namespace cc | 1854 } // namespace cc |
OLD | NEW |