Chromium Code Reviews| 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/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "base/trace_event/trace_event.h" | 9 #include "base/trace_event/trace_event.h" |
| 10 #include "base/trace_event/trace_event_argument.h" | 10 #include "base/trace_event/trace_event_argument.h" |
| (...skipping 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1214 | 1214 |
| 1215 if (changed) | 1215 if (changed) |
| 1216 DidUpdateScrollOffset(false); | 1216 DidUpdateScrollOffset(false); |
| 1217 } | 1217 } |
| 1218 | 1218 |
| 1219 void LayerImpl::DidUpdateScrollOffset(bool is_from_root_delegate) { | 1219 void LayerImpl::DidUpdateScrollOffset(bool is_from_root_delegate) { |
| 1220 if (!is_from_root_delegate) | 1220 if (!is_from_root_delegate) |
| 1221 layer_tree_impl()->DidUpdateScrollOffset(id()); | 1221 layer_tree_impl()->DidUpdateScrollOffset(id()); |
| 1222 NoteLayerPropertyChangedForSubtree(); | 1222 NoteLayerPropertyChangedForSubtree(); |
| 1223 ScrollbarParametersDidChange(false); | 1223 ScrollbarParametersDidChange(false); |
| 1224 if (layer_tree_impl()->IsActiveTree()) { | |
| 1225 LayerImpl* pending_twin = layer_tree_impl()->FindPendingTreeLayerById(id()); | |
| 1226 if (pending_twin) { | |
| 1227 pending_twin->NoteLayerPropertyChangedForSubtree(); | |
| 1228 pending_twin->ScrollbarParametersDidChange(false); | |
|
aelias_OOO_until_Jul13
2015/05/08 21:44:00
I don't think this line is needed, pending tree sc
vmpstr
2015/05/11 18:36:15
Removed.
| |
| 1229 } | |
| 1230 } | |
| 1224 } | 1231 } |
| 1225 | 1232 |
| 1226 void LayerImpl::SetDoubleSided(bool double_sided) { | 1233 void LayerImpl::SetDoubleSided(bool double_sided) { |
| 1227 if (double_sided_ == double_sided) | 1234 if (double_sided_ == double_sided) |
| 1228 return; | 1235 return; |
| 1229 | 1236 |
| 1230 double_sided_ = double_sided; | 1237 double_sided_ = double_sided; |
| 1231 NoteLayerPropertyChangedForSubtree(); | 1238 NoteLayerPropertyChangedForSubtree(); |
| 1232 } | 1239 } |
| 1233 | 1240 |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1635 gfx::Transform scaled_draw_transform = | 1642 gfx::Transform scaled_draw_transform = |
| 1636 draw_properties_.target_space_transform; | 1643 draw_properties_.target_space_transform; |
| 1637 scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale); | 1644 scaled_draw_transform.Scale(SK_MScalar1 / scale, SK_MScalar1 / scale); |
| 1638 gfx::Size scaled_content_bounds = | 1645 gfx::Size scaled_content_bounds = |
| 1639 gfx::ToCeiledSize(gfx::ScaleSize(content_bounds(), scale)); | 1646 gfx::ToCeiledSize(gfx::ScaleSize(content_bounds(), scale)); |
| 1640 return MathUtil::MapEnclosingClippedRect(scaled_draw_transform, | 1647 return MathUtil::MapEnclosingClippedRect(scaled_draw_transform, |
| 1641 gfx::Rect(scaled_content_bounds)); | 1648 gfx::Rect(scaled_content_bounds)); |
| 1642 } | 1649 } |
| 1643 | 1650 |
| 1644 } // namespace cc | 1651 } // namespace cc |
| OLD | NEW |