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

Unified Diff: cc/quads/draw_quad.cc

Issue 380763002: Add builders for tracing event's structural arguments (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed memory leak found by Linux ASAN Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/quads/draw_quad.h ('k') | cc/quads/io_surface_draw_quad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/draw_quad.cc
diff --git a/cc/quads/draw_quad.cc b/cc/quads/draw_quad.cc
index b669ad7fe9d2dca05a8c1f60f3009225e716f710..38b24b0cd0a16228fb4fb7dfed8a5d7010221618 100644
--- a/cc/quads/draw_quad.cc
+++ b/cc/quads/draw_quad.cc
@@ -4,6 +4,7 @@
#include "cc/quads/draw_quad.h"
+#include "base/debug/trace_event_argument.h"
#include "base/logging.h"
#include "base/values.h"
#include "cc/base/math_util.h"
@@ -56,48 +57,59 @@ void DrawQuad::SetAll(const SharedQuadState* shared_quad_state,
DrawQuad::~DrawQuad() {
}
-scoped_ptr<base::Value> DrawQuad::AsValue() const {
- scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
+void DrawQuad::AsValueInto(base::debug::TracedValue* value) const {
value->SetInteger("material", material);
- value->Set("shared_state",
- TracedValue::CreateIDRef(shared_quad_state).release());
+ TracedValue::SetIDRef(shared_quad_state, value, "shared_state");
+
+ value->BeginArray("content_space_rect");
+ MathUtil::AddToTracedValue(rect, value);
+ value->EndArray();
- value->Set("content_space_rect", MathUtil::AsValue(rect).release());
bool rect_is_clipped;
gfx::QuadF rect_as_target_space_quad = MathUtil::MapQuad(
shared_quad_state->content_to_target_transform,
gfx::QuadF(rect),
&rect_is_clipped);
- value->Set("rect_as_target_space_quad",
- MathUtil::AsValue(rect_as_target_space_quad).release());
+ value->BeginArray("rect_as_target_space_quad");
+ MathUtil::AddToTracedValue(rect_as_target_space_quad, value);
+ value->EndArray();
+
value->SetBoolean("rect_is_clipped", rect_is_clipped);
- value->Set("content_space_opaque_rect",
- MathUtil::AsValue(opaque_rect).release());
+ value->BeginArray("content_space_opaque_rect");
+ MathUtil::AddToTracedValue(opaque_rect, value);
+ value->EndArray();
+
bool opaque_rect_is_clipped;
gfx::QuadF opaque_rect_as_target_space_quad = MathUtil::MapQuad(
shared_quad_state->content_to_target_transform,
gfx::QuadF(opaque_rect),
&opaque_rect_is_clipped);
- value->Set("opaque_rect_as_target_space_quad",
- MathUtil::AsValue(opaque_rect_as_target_space_quad).release());
+ value->BeginArray("opaque_rect_as_target_space_quad");
+ MathUtil::AddToTracedValue(opaque_rect_as_target_space_quad, value);
+ value->EndArray();
+
value->SetBoolean("opaque_rect_is_clipped", opaque_rect_is_clipped);
- value->Set("content_space_visible_rect",
- MathUtil::AsValue(visible_rect).release());
+ value->BeginArray("content_space_visible_rect");
+ MathUtil::AddToTracedValue(visible_rect, value);
+ value->EndArray();
+
bool visible_rect_is_clipped;
gfx::QuadF visible_rect_as_target_space_quad = MathUtil::MapQuad(
shared_quad_state->content_to_target_transform,
gfx::QuadF(visible_rect),
&visible_rect_is_clipped);
- value->Set("visible_rect_as_target_space_quad",
- MathUtil::AsValue(visible_rect_as_target_space_quad).release());
+
+ value->BeginArray("visible_rect_as_target_space_quad");
+ MathUtil::AddToTracedValue(visible_rect_as_target_space_quad, value);
+ value->EndArray();
+
value->SetBoolean("visible_rect_is_clipped", visible_rect_is_clipped);
value->SetBoolean("needs_blending", needs_blending);
value->SetBoolean("should_draw_with_blending", ShouldDrawWithBlending());
- ExtendValue(value.get());
- return value.PassAs<base::Value>();
+ ExtendValue(value);
}
} // namespace cc
« no previous file with comments | « cc/quads/draw_quad.h ('k') | cc/quads/io_surface_draw_quad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698