| 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 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1239 if (!touch_event_handler_region_.IsEmpty()) { | 1239 if (!touch_event_handler_region_.IsEmpty()) { |
| 1240 state->BeginArray("touch_event_handler_region"); | 1240 state->BeginArray("touch_event_handler_region"); |
| 1241 touch_event_handler_region_.AsValueInto(state); | 1241 touch_event_handler_region_.AsValueInto(state); |
| 1242 state->EndArray(); | 1242 state->EndArray(); |
| 1243 } | 1243 } |
| 1244 if (!non_fast_scrollable_region_.IsEmpty()) { | 1244 if (!non_fast_scrollable_region_.IsEmpty()) { |
| 1245 state->BeginArray("non_fast_scrollable_region"); | 1245 state->BeginArray("non_fast_scrollable_region"); |
| 1246 non_fast_scrollable_region_.AsValueInto(state); | 1246 non_fast_scrollable_region_.AsValueInto(state); |
| 1247 state->EndArray(); | 1247 state->EndArray(); |
| 1248 } | 1248 } |
| 1249 state->BeginArray("children"); | |
| 1250 for (size_t i = 0; i < children_.size(); ++i) { | |
| 1251 state->BeginDictionary(); | |
| 1252 children_[i]->AsValueInto(state); | |
| 1253 state->EndDictionary(); | |
| 1254 } | |
| 1255 state->EndArray(); | |
| 1256 if (mask_layer_) { | 1249 if (mask_layer_) { |
| 1257 state->BeginDictionary("mask_layer"); | 1250 state->BeginDictionary("mask_layer"); |
| 1258 mask_layer_->AsValueInto(state); | 1251 mask_layer_->AsValueInto(state); |
| 1259 state->EndDictionary(); | 1252 state->EndDictionary(); |
| 1260 } | 1253 } |
| 1261 if (replica_layer_) { | 1254 if (replica_layer_) { |
| 1262 state->BeginDictionary("replica_layer"); | 1255 state->BeginDictionary("replica_layer"); |
| 1263 replica_layer_->AsValueInto(state); | 1256 replica_layer_->AsValueInto(state); |
| 1264 state->EndDictionary(); | 1257 state->EndDictionary(); |
| 1265 } | 1258 } |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1410 .layer_transforms_should_scale_layer_contents) { | 1403 .layer_transforms_should_scale_layer_contents) { |
| 1411 return default_scale; | 1404 return default_scale; |
| 1412 } | 1405 } |
| 1413 | 1406 |
| 1414 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( | 1407 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( |
| 1415 DrawTransform(), default_scale); | 1408 DrawTransform(), default_scale); |
| 1416 return std::max(transform_scales.x(), transform_scales.y()); | 1409 return std::max(transform_scales.x(), transform_scales.y()); |
| 1417 } | 1410 } |
| 1418 | 1411 |
| 1419 } // namespace cc | 1412 } // namespace cc |
| OLD | NEW |