| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 1bea3bfeece9effb79fd332832db9c962ec1b8ec..a28068e6a1e7aae0f33e281ef3d9238c859ce2ce 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -173,8 +173,9 @@
|
| virtual void ForceSerializeOnSwapBuffers() OVERRIDE;
|
| virtual bool SupportsImplScrolling() const OVERRIDE;
|
| virtual void SetDebugState(const LayerTreeDebugState& debug_state) OVERRIDE;
|
| - virtual void AsValueInto(base::debug::TracedValue* value) const OVERRIDE;
|
| + virtual scoped_ptr<base::Value> AsValue() const OVERRIDE;
|
| virtual bool CommitPendingForTesting() OVERRIDE;
|
| + virtual scoped_ptr<base::Value> SchedulerAsValueForTesting() OVERRIDE;
|
|
|
| // LayerTreeHostImplClient implementation
|
| virtual void UpdateRendererCapabilitiesOnImplThread() OVERRIDE;
|
| @@ -276,8 +277,9 @@
|
| void ForceSerializeOnSwapBuffersOnImplThread(CompletionEvent* completion);
|
| void CheckOutputSurfaceStatusOnImplThread();
|
| void CommitPendingOnImplThreadForTesting(CommitPendingRequest* request);
|
| + void SchedulerAsValueOnImplThreadForTesting(SchedulerStateRequest* request);
|
| void AsValueOnImplThread(CompletionEvent* completion,
|
| - base::debug::TracedValue* state) const;
|
| + base::DictionaryValue* state) const;
|
| void SetSwapUsedIncompleteTileOnImplThread(bool used_incomplete_tile);
|
| void MainThreadHasStoppedFlingingOnImplThread();
|
| void SetInputThrottledUntilCommitOnImplThread(bool is_throttled);
|
|
|