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

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

Issue 935333002: Update from https://crrev.com/316786 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « cc/output/filter_operations.h ('k') | cc/output/gl_renderer.cc » ('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 "cc/output/filter_operations.h" 5 #include "cc/output/filter_operations.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "base/trace_event/trace_event_argument.h" 9 #include "base/trace_event/trace_event_argument.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 FilterOperation::Blend(&from.at(i), NULL, progress)); 190 FilterOperation::Blend(&from.at(i), NULL, progress));
191 } 191 }
192 } else { 192 } else {
193 for (size_t i = shorter_size; i < longer_size; i++) 193 for (size_t i = shorter_size; i < longer_size; i++)
194 blended_filters.Append(FilterOperation::Blend(NULL, &at(i), progress)); 194 blended_filters.Append(FilterOperation::Blend(NULL, &at(i), progress));
195 } 195 }
196 196
197 return blended_filters; 197 return blended_filters;
198 } 198 }
199 199
200 void FilterOperations::AsValueInto(base::debug::TracedValue* value) const { 200 void FilterOperations::AsValueInto(
201 base::trace_event::TracedValue* value) const {
201 for (size_t i = 0; i < operations_.size(); ++i) { 202 for (size_t i = 0; i < operations_.size(); ++i) {
202 value->BeginDictionary(); 203 value->BeginDictionary();
203 operations_[i].AsValueInto(value); 204 operations_[i].AsValueInto(value);
204 value->EndDictionary(); 205 value->EndDictionary();
205 } 206 }
206 } 207 }
207 208
208 } // namespace cc 209 } // namespace cc
OLDNEW
« no previous file with comments | « cc/output/filter_operations.h ('k') | cc/output/gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698