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

Side by Side Diff: cc/quads/render_pass_draw_quad.cc

Issue 801293003: Fix a trace value type in RenderPassDrawQuad. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/quads/render_pass_draw_quad.h" 5 #include "cc/quads/render_pass_draw_quad.h"
6 6
7 #include "base/debug/trace_event_argument.h" 7 #include "base/debug/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/debug/traced_value.h" 10 #include "cc/debug/traced_value.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast( 92 const RenderPassDrawQuad* RenderPassDrawQuad::MaterialCast(
93 const DrawQuad* quad) { 93 const DrawQuad* quad) {
94 DCHECK_EQ(quad->material, DrawQuad::RENDER_PASS); 94 DCHECK_EQ(quad->material, DrawQuad::RENDER_PASS);
95 return static_cast<const RenderPassDrawQuad*>(quad); 95 return static_cast<const RenderPassDrawQuad*>(quad);
96 } 96 }
97 97
98 void RenderPassDrawQuad::ExtendValue(base::debug::TracedValue* value) const { 98 void RenderPassDrawQuad::ExtendValue(base::debug::TracedValue* value) const {
99 TracedValue::SetIDRef(render_pass_id.AsTracingId(), value, "render_pass_id"); 99 TracedValue::SetIDRef(render_pass_id.AsTracingId(), value, "render_pass_id");
100 value->SetInteger("mask_resource_id", mask_resource_id); 100 value->SetInteger("mask_resource_id", mask_resource_id);
101 101
102 value->BeginArray("mask_texture_size"); 102 value->BeginDictionary("mask_texture_size");
danakj 2015/01/12 18:03:22 Oof, this is kinda meh. We can surely make a bette
JungJik 2015/01/13 01:04:42 thanks for the review. I understand your intention
103 MathUtil::AddToTracedValue(mask_texture_size, value); 103 MathUtil::AddToTracedValue(mask_texture_size, value);
104 value->EndArray(); 104 value->EndDictionary();
105 105
106 value->BeginArray("mask_uv_scale"); 106 value->BeginArray("mask_uv_scale");
107 MathUtil::AddToTracedValue(mask_uv_scale, value); 107 MathUtil::AddToTracedValue(mask_uv_scale, value);
108 value->EndArray(); 108 value->EndArray();
109 109
110 value->BeginDictionary("filters"); 110 value->BeginDictionary("filters");
111 filters.AsValueInto(value); 111 filters.AsValueInto(value);
112 value->EndDictionary(); 112 value->EndDictionary();
113 113
114 value->BeginArray("filters_scale"); 114 value->BeginArray("filters_scale");
115 MathUtil::AddToTracedValue(filters_scale, value); 115 MathUtil::AddToTracedValue(filters_scale, value);
116 value->EndArray(); 116 value->EndArray();
117 117
118 value->BeginDictionary("background_filters"); 118 value->BeginDictionary("background_filters");
119 background_filters.AsValueInto(value); 119 background_filters.AsValueInto(value);
120 value->EndDictionary(); 120 value->EndDictionary();
121 } 121 }
122 122
123 } // namespace cc 123 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698