| 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> |
| 8 #include <stdint.h> |
| 9 |
| 7 #include <utility> | 10 #include <utility> |
| 8 | 11 |
| 9 #include "base/json/json_reader.h" | 12 #include "base/json/json_reader.h" |
| 10 #include "base/numerics/safe_conversions.h" | 13 #include "base/numerics/safe_conversions.h" |
| 11 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
| 12 #include "base/trace_event/trace_event.h" | 15 #include "base/trace_event/trace_event.h" |
| 13 #include "base/trace_event/trace_event_argument.h" | 16 #include "base/trace_event/trace_event_argument.h" |
| 14 #include "cc/animation/animation_registrar.h" | 17 #include "cc/animation/animation_registrar.h" |
| 15 #include "cc/animation/mutable_properties.h" | 18 #include "cc/animation/mutable_properties.h" |
| 16 #include "cc/base/math_util.h" | 19 #include "cc/base/math_util.h" |
| (...skipping 1880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1897 .layer_transforms_should_scale_layer_contents) { | 1900 .layer_transforms_should_scale_layer_contents) { |
| 1898 return default_scale; | 1901 return default_scale; |
| 1899 } | 1902 } |
| 1900 | 1903 |
| 1901 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( | 1904 gfx::Vector2dF transform_scales = MathUtil::ComputeTransform2dScaleComponents( |
| 1902 DrawTransform(), default_scale); | 1905 DrawTransform(), default_scale); |
| 1903 return std::max(transform_scales.x(), transform_scales.y()); | 1906 return std::max(transform_scales.x(), transform_scales.y()); |
| 1904 } | 1907 } |
| 1905 | 1908 |
| 1906 } // namespace cc | 1909 } // namespace cc |
| OLD | NEW |