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/picture_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/picture_draw_quad.cc')
| -rw-r--r-- | cc/quads/picture_draw_quad.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cc/quads/picture_draw_quad.cc b/cc/quads/picture_draw_quad.cc index af120a4..cb1c2c1 100644 --- a/cc/quads/picture_draw_quad.cc +++ b/cc/quads/picture_draw_quad.cc @@ -4,7 +4,6 @@ #include "cc/quads/picture_draw_quad.h" -#include "base/debug/trace_event_argument.h" #include "base/values.h" #include "cc/base/math_util.h" #include "cc/resources/platform_color.h" @@ -80,11 +79,9 @@ const PictureDrawQuad* PictureDrawQuad::MaterialCast(const DrawQuad* quad) { return static_cast<const PictureDrawQuad*>(quad); } -void PictureDrawQuad::ExtendValue(base::debug::TracedValue* value) const { +void PictureDrawQuad::ExtendValue(base::DictionaryValue* value) const { ContentDrawQuadBase::ExtendValue(value); - value->BeginArray("content_rect"); - MathUtil::AddToTracedValue(content_rect, value); - value->EndArray(); + value->Set("content_rect", MathUtil::AsValue(content_rect).release()); value->SetDouble("contents_scale", contents_scale); value->SetInteger("texture_format", texture_format); // TODO(piman): picture_pile? |