| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <algorithm> | 5 #include <algorithm> |
| 6 | 6 |
| 7 #include "base/values.h" | 7 #include "base/values.h" |
| 8 #include "cc/base/math_util.h" | 8 #include "cc/base/math_util.h" |
| 9 #include "cc/output/filter_operation.h" | 9 #include "cc/output/filter_operation.h" |
| 10 #include "third_party/skia/include/core/SkMath.h" | |
| 11 #include "ui/gfx/animation/tween.h" | 10 #include "ui/gfx/animation/tween.h" |
| 12 | 11 |
| 13 namespace cc { | 12 namespace cc { |
| 14 | 13 |
| 15 bool FilterOperation::operator==(const FilterOperation& other) const { | 14 bool FilterOperation::operator==(const FilterOperation& other) const { |
| 16 if (type_ != other.type_) | 15 if (type_ != other.type_) |
| 17 return false; | 16 return false; |
| 18 if (type_ == COLOR_MATRIX) | 17 if (type_ == COLOR_MATRIX) |
| 19 return !memcmp(matrix_, other.matrix_, sizeof(matrix_)); | 18 return !memcmp(matrix_, other.matrix_, sizeof(matrix_)); |
| 20 if (type_ == DROP_SHADOW) { | 19 if (type_ == DROP_SHADOW) { |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 region_value->AppendInteger(it.rect().height()); | 309 region_value->AppendInteger(it.rect().height()); |
| 311 } | 310 } |
| 312 value->Set("region", region_value.release()); | 311 value->Set("region", region_value.release()); |
| 313 } | 312 } |
| 314 break; | 313 break; |
| 315 } | 314 } |
| 316 return value.PassAs<base::Value>(); | 315 return value.PassAs<base::Value>(); |
| 317 } | 316 } |
| 318 | 317 |
| 319 } // namespace cc | 318 } // namespace cc |
| OLD | NEW |