| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 1210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1221 if (!touch_event_handler_region_.IsEmpty()) { | 1221 if (!touch_event_handler_region_.IsEmpty()) { |
| 1222 state->BeginArray("touch_event_handler_region"); | 1222 state->BeginArray("touch_event_handler_region"); |
| 1223 touch_event_handler_region_.AsValueInto(state); | 1223 touch_event_handler_region_.AsValueInto(state); |
| 1224 state->EndArray(); | 1224 state->EndArray(); |
| 1225 } | 1225 } |
| 1226 if (!non_fast_scrollable_region_.IsEmpty()) { | 1226 if (!non_fast_scrollable_region_.IsEmpty()) { |
| 1227 state->BeginArray("non_fast_scrollable_region"); | 1227 state->BeginArray("non_fast_scrollable_region"); |
| 1228 non_fast_scrollable_region_.AsValueInto(state); | 1228 non_fast_scrollable_region_.AsValueInto(state); |
| 1229 state->EndArray(); | 1229 state->EndArray(); |
| 1230 } | 1230 } |
| 1231 state->BeginArray("children"); | |
| 1232 for (size_t i = 0; i < children_.size(); ++i) { | |
| 1233 state->BeginDictionary(); | |
| 1234 children_[i]->AsValueInto(state); | |
| 1235 state->EndDictionary(); | |
| 1236 } | |
| 1237 state->EndArray(); | |
| 1238 if (mask_layer_) { | 1231 if (mask_layer_) { |
| 1239 state->BeginDictionary("mask_layer"); | 1232 state->BeginDictionary("mask_layer"); |
| 1240 mask_layer_->AsValueInto(state); | 1233 mask_layer_->AsValueInto(state); |
| 1241 state->EndDictionary(); | 1234 state->EndDictionary(); |
| 1242 } | 1235 } |
| 1243 if (replica_layer_) { | 1236 if (replica_layer_) { |
| 1244 state->BeginDictionary("replica_layer"); | 1237 state->BeginDictionary("replica_layer"); |
| 1245 replica_layer_->AsValueInto(state); | 1238 replica_layer_->AsValueInto(state); |
| 1246 state->EndDictionary(); | 1239 state->EndDictionary(); |
| 1247 } | 1240 } |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1395 .layer_transforms_should_scale_layer_contents) { | 1388 .layer_transforms_should_scale_layer_contents) { |
| 1396 return default_scale; | 1389 return default_scale; |
| 1397 } | 1390 } |
| 1398 | 1391 |
| 1399 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( | 1392 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( |
| 1400 ScreenSpaceTransform(), default_scale); | 1393 ScreenSpaceTransform(), default_scale); |
| 1401 return std::max(transform_scales.x(), transform_scales.y()); | 1394 return std::max(transform_scales.x(), transform_scales.y()); |
| 1402 } | 1395 } |
| 1403 | 1396 |
| 1404 } // namespace cc | 1397 } // namespace cc |
| OLD | NEW |