Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(659)

Side by Side Diff: cc/output/filter_operations.cc

Issue 421183003: Revert of Add builders for tracing event's structural arguments (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/output/filter_operations.h ('k') | cc/quads/checkerboard_draw_quad.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <cmath>
6
5 #include "cc/output/filter_operations.h" 7 #include "cc/output/filter_operations.h"
6 8
7 #include <cmath>
8
9 #include "base/debug/trace_event_argument.h"
10 #include "base/values.h" 9 #include "base/values.h"
11 #include "cc/output/filter_operation.h" 10 #include "cc/output/filter_operation.h"
12 11
13 namespace cc { 12 namespace cc {
14 13
15 FilterOperations::FilterOperations() {} 14 FilterOperations::FilterOperations() {}
16 15
17 FilterOperations::FilterOperations(const FilterOperations& other) 16 FilterOperations::FilterOperations(const FilterOperations& other)
18 : operations_(other.operations_) {} 17 : operations_(other.operations_) {}
19 18
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 FilterOperation::Blend(&from.at(i), NULL, progress)); 189 FilterOperation::Blend(&from.at(i), NULL, progress));
191 } 190 }
192 } else { 191 } else {
193 for (size_t i = shorter_size; i < longer_size; i++) 192 for (size_t i = shorter_size; i < longer_size; i++)
194 blended_filters.Append(FilterOperation::Blend(NULL, &at(i), progress)); 193 blended_filters.Append(FilterOperation::Blend(NULL, &at(i), progress));
195 } 194 }
196 195
197 return blended_filters; 196 return blended_filters;
198 } 197 }
199 198
200 void FilterOperations::AsValueInto(base::debug::TracedValue* value) const { 199 scoped_ptr<base::Value> FilterOperations::AsValue() const {
201 for (size_t i = 0; i < operations_.size(); ++i) { 200 scoped_ptr<base::ListValue> value(new base::ListValue);
202 value->BeginDictionary(); 201 for (size_t i = 0; i < operations_.size(); ++i)
203 operations_[i].AsValueInto(value); 202 value->Append(operations_[i].AsValue().release());
204 value->EndDictionary(); 203 return value.PassAs<base::Value>();
205 }
206 } 204 }
207 205
208 } // namespace cc 206 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/filter_operations.h ('k') | cc/quads/checkerboard_draw_quad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698