trunk/src/cc/trees/single_thread_proxy.h - Issue 23702010: Revert 220418 "cc: Block commit on activate by setting a flag on..."

Side by Side Diff: trunk/src/cc/trees/single_thread_proxy.h

Issue 23702010: Revert 220418 "cc: Block commit on activate by setting a flag on..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/cc/trees/proxy.h ('k') | trunk/src/cc/trees/single_thread_proxy.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2011 The Chromium Authors. All rights reserved.	1 // Copyright 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CC_TREES_SINGLE_THREAD_PROXY_H_	5 #ifndef CC_TREES_SINGLE_THREAD_PROXY_H_

6 #define CC_TREES_SINGLE_THREAD_PROXY_H_	6 #define CC_TREES_SINGLE_THREAD_PROXY_H_

7	7

8 #include <limits>	8 #include <limits>

9	9

10 #include "base/time/time.h"	10 #include "base/time/time.h"

(...skipping 17 matching lines...) Expand all Loading...
28 virtual void FinishAllRendering() OVERRIDE;	28 virtual void FinishAllRendering() OVERRIDE;

29 virtual bool IsStarted() const OVERRIDE;	29 virtual bool IsStarted() const OVERRIDE;

30 virtual void SetLayerTreeHostClientReady() OVERRIDE;	30 virtual void SetLayerTreeHostClientReady() OVERRIDE;

31 virtual void SetVisible(bool visible) OVERRIDE;	31 virtual void SetVisible(bool visible) OVERRIDE;

32 virtual void CreateAndInitializeOutputSurface() OVERRIDE;	32 virtual void CreateAndInitializeOutputSurface() OVERRIDE;

33 virtual const RendererCapabilities& GetRendererCapabilities() const OVERRIDE;	33 virtual const RendererCapabilities& GetRendererCapabilities() const OVERRIDE;

34 virtual void SetNeedsAnimate() OVERRIDE;	34 virtual void SetNeedsAnimate() OVERRIDE;

35 virtual void SetNeedsUpdateLayers() OVERRIDE;	35 virtual void SetNeedsUpdateLayers() OVERRIDE;

36 virtual void SetNeedsCommit() OVERRIDE;	36 virtual void SetNeedsCommit() OVERRIDE;

37 virtual void SetNeedsRedraw(gfx::Rect damage_rect) OVERRIDE;	37 virtual void SetNeedsRedraw(gfx::Rect damage_rect) OVERRIDE;

38 virtual void SetNextCommitWaitsForActivation() OVERRIDE;

39 virtual void NotifyInputThrottledUntilCommit() OVERRIDE {}	38 virtual void NotifyInputThrottledUntilCommit() OVERRIDE {}

40 virtual void SetDeferCommits(bool defer_commits) OVERRIDE;	39 virtual void SetDeferCommits(bool defer_commits) OVERRIDE;

41 virtual bool CommitRequested() const OVERRIDE;	40 virtual bool CommitRequested() const OVERRIDE;

42 virtual void MainThreadHasStoppedFlinging() OVERRIDE {}	41 virtual void MainThreadHasStoppedFlinging() OVERRIDE {}

43 virtual void Start(scoped_ptr<OutputSurface> first_output_surface) OVERRIDE;	42 virtual void Start(scoped_ptr<OutputSurface> first_output_surface) OVERRIDE;

44 virtual void Stop() OVERRIDE;	43 virtual void Stop() OVERRIDE;

45 virtual size_t MaxPartialTextureUpdates() const OVERRIDE;	44 virtual size_t MaxPartialTextureUpdates() const OVERRIDE;

46 virtual void AcquireLayerTextures() OVERRIDE {}	45 virtual void AcquireLayerTextures() OVERRIDE {}

47 virtual void ForceSerializeOnSwapBuffers() OVERRIDE;	46 virtual void ForceSerializeOnSwapBuffers() OVERRIDE;

48 virtual scoped_ptr<base::Value> AsValue() const OVERRIDE;	47 virtual scoped_ptr<base::Value> AsValue() const OVERRIDE;

(...skipping 123 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
172 private:	171 private:

173 DebugScopedSetImplThread impl_thread_;	172 DebugScopedSetImplThread impl_thread_;

174 DebugScopedSetMainThreadBlocked main_thread_blocked_;	173 DebugScopedSetMainThreadBlocked main_thread_blocked_;

175	174

176 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked);	175 DISALLOW_COPY_AND_ASSIGN(DebugScopedSetImplThreadAndMainThreadBlocked);

177 };	176 };

178	177

179 } // namespace cc	178 } // namespace cc

180	179

181 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_	180 #endif // CC_TREES_SINGLE_THREAD_PROXY_H_

OLD	NEW