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/trace_event/trace_event_argument.h" | 7 #include "base/trace_event/trace_event_argument.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "cc/base/math_util.h" | 9 #include "cc/base/math_util.h" |
10 #include "cc/output/filter_operation.h" | 10 #include "cc/output/filter_operation.h" |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 gfx::Tween::FloatValueBetween(progress, | 248 gfx::Tween::FloatValueBetween(progress, |
249 from_op.outer_threshold(), | 249 from_op.outer_threshold(), |
250 to_op.outer_threshold()), | 250 to_op.outer_threshold()), |
251 to_op.type())); | 251 to_op.type())); |
252 blended_filter.set_region(to_op.region()); | 252 blended_filter.set_region(to_op.region()); |
253 } | 253 } |
254 | 254 |
255 return blended_filter; | 255 return blended_filter; |
256 } | 256 } |
257 | 257 |
258 void FilterOperation::AsValueInto(base::debug::TracedValue* value) const { | 258 void FilterOperation::AsValueInto(base::trace_event::TracedValue* value) const { |
259 value->SetInteger("type", type_); | 259 value->SetInteger("type", type_); |
260 switch (type_) { | 260 switch (type_) { |
261 case FilterOperation::GRAYSCALE: | 261 case FilterOperation::GRAYSCALE: |
262 case FilterOperation::SEPIA: | 262 case FilterOperation::SEPIA: |
263 case FilterOperation::SATURATE: | 263 case FilterOperation::SATURATE: |
264 case FilterOperation::HUE_ROTATE: | 264 case FilterOperation::HUE_ROTATE: |
265 case FilterOperation::INVERT: | 265 case FilterOperation::INVERT: |
266 case FilterOperation::BRIGHTNESS: | 266 case FilterOperation::BRIGHTNESS: |
267 case FilterOperation::CONTRAST: | 267 case FilterOperation::CONTRAST: |
268 case FilterOperation::OPACITY: | 268 case FilterOperation::OPACITY: |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 value->AppendInteger(it.rect().width()); | 309 value->AppendInteger(it.rect().width()); |
310 value->AppendInteger(it.rect().height()); | 310 value->AppendInteger(it.rect().height()); |
311 } | 311 } |
312 value->EndArray(); | 312 value->EndArray(); |
313 } | 313 } |
314 break; | 314 break; |
315 } | 315 } |
316 } | 316 } |
317 | 317 |
318 } // namespace cc | 318 } // namespace cc |
OLD | NEW |