diff options
author | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 19:02:09 +0000 |
---|---|---|
committer | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 19:02:09 +0000 |
commit | 88bcc14cd89a644f09a0ec660901c1454a5526c0 (patch) | |
tree | 92d22c761b891111bd7ebefb625d027afbd065b7 /cc/quads/draw_quad.cc | |
parent | e9b84dd07ea9dc15a4315703bd94a0b0d89052f9 (diff) | |
download | chromium_src-88bcc14cd89a644f09a0ec660901c1454a5526c0.zip chromium_src-88bcc14cd89a644f09a0ec660901c1454a5526c0.tar.gz chromium_src-88bcc14cd89a644f09a0ec660901c1454a5526c0.tar.bz2 |
Revert of Add builders for tracing event's structural arguments (https://codereview.chromium.org/380763002/)
Reason for revert:
linux ASAN errors.
http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%20LSan%20Tests%20%281%29/builds/4493/steps/base_unittests/logs/stdio
Original issue's description:
> Add builders for tracing event's structural arguments
>
> The new classes allow building JSON-like structural arguments. Current implementation uses base::Value as backing store but that can be replaced in the future with something more efficient without changing client code.
>
> All clients of cc/debug/traced_value.h should eventually switch to use the new builders.
>
> BUG=361045
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=286849
TBR=alph, caseq, dsinclair, nduca, willchan, yurys
NOTREECHECKS=true
NOTRY=true
BUG=361045
Review URL: https://codereview.chromium.org/421183003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286862 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/quads/draw_quad.cc')
-rw-r--r-- | cc/quads/draw_quad.cc | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/cc/quads/draw_quad.cc b/cc/quads/draw_quad.cc index 38b24b0..b669ad7 100644 --- a/cc/quads/draw_quad.cc +++ b/cc/quads/draw_quad.cc @@ -4,7 +4,6 @@ #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" @@ -57,59 +56,48 @@ void DrawQuad::SetAll(const SharedQuadState* shared_quad_state, DrawQuad::~DrawQuad() { } -void DrawQuad::AsValueInto(base::debug::TracedValue* value) const { +scoped_ptr<base::Value> DrawQuad::AsValue() const { + scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue()); value->SetInteger("material", material); - TracedValue::SetIDRef(shared_quad_state, value, "shared_state"); - - value->BeginArray("content_space_rect"); - MathUtil::AddToTracedValue(rect, value); - value->EndArray(); + value->Set("shared_state", + TracedValue::CreateIDRef(shared_quad_state).release()); + 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->BeginArray("rect_as_target_space_quad"); - MathUtil::AddToTracedValue(rect_as_target_space_quad, value); - value->EndArray(); - + value->Set("rect_as_target_space_quad", + MathUtil::AsValue(rect_as_target_space_quad).release()); value->SetBoolean("rect_is_clipped", rect_is_clipped); - value->BeginArray("content_space_opaque_rect"); - MathUtil::AddToTracedValue(opaque_rect, value); - value->EndArray(); - + value->Set("content_space_opaque_rect", + MathUtil::AsValue(opaque_rect).release()); 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->BeginArray("opaque_rect_as_target_space_quad"); - MathUtil::AddToTracedValue(opaque_rect_as_target_space_quad, value); - value->EndArray(); - + value->Set("opaque_rect_as_target_space_quad", + MathUtil::AsValue(opaque_rect_as_target_space_quad).release()); value->SetBoolean("opaque_rect_is_clipped", opaque_rect_is_clipped); - value->BeginArray("content_space_visible_rect"); - MathUtil::AddToTracedValue(visible_rect, value); - value->EndArray(); - + value->Set("content_space_visible_rect", + MathUtil::AsValue(visible_rect).release()); 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->BeginArray("visible_rect_as_target_space_quad"); - MathUtil::AddToTracedValue(visible_rect_as_target_space_quad, value); - value->EndArray(); - + value->Set("visible_rect_as_target_space_quad", + MathUtil::AsValue(visible_rect_as_target_space_quad).release()); 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); + ExtendValue(value.get()); + return value.PassAs<base::Value>(); } } // namespace cc |