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/trees/proxy.h | |
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/trees/proxy.h')
-rw-r--r-- | cc/trees/proxy.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h index 6100562..7854edc 100644 --- a/cc/trees/proxy.h +++ b/cc/trees/proxy.h @@ -16,12 +16,7 @@ #include "base/values.h" #include "cc/base/cc_export.h" -namespace base { -namespace debug { -class TracedValue; -} -class SingleThreadTaskRunner; -} +namespace base { class SingleThreadTaskRunner; } namespace gfx { class Rect; @@ -96,12 +91,13 @@ class CC_EXPORT Proxy { virtual bool SupportsImplScrolling() const = 0; - virtual void AsValueInto(base::debug::TracedValue* value) const = 0; + virtual scoped_ptr<base::Value> AsValue() const = 0; virtual void SetDebugState(const LayerTreeDebugState& debug_state) = 0; // Testing hooks virtual bool CommitPendingForTesting() = 0; + virtual scoped_ptr<base::Value> SchedulerAsValueForTesting(); protected: Proxy(scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, |