diff options
| author | skaslev@chromium.org <skaslev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 17:10:56 +0000 |
|---|---|---|
| committer | skaslev@chromium.org <skaslev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 17:10:56 +0000 |
| commit | c7480aff12d1133ab4216fa6580e2edbef4d7078 (patch) | |
| tree | 434dfe820371e751e9fb2e686ee0f72c19a61443 /cc/trees/proxy.h | |
| parent | 8426f3aaa2ba2fe446512c4dbcd7bcf3b4c7eb4a (diff) | |
| download | chromium_src-c7480aff12d1133ab4216fa6580e2edbef4d7078.zip chromium_src-c7480aff12d1133ab4216fa6580e2edbef4d7078.tar.gz chromium_src-c7480aff12d1133ab4216fa6580e2edbef4d7078.tar.bz2 | |
Revert 205750 "cc: Emulate BeginFrame in OutputSurfaces that don..."
> cc: Emulate BeginFrame in OutputSurfaces that don't support it natively
>
> This will allow us to avoid having two different code paths
> in the Scheduler. It also allows us to more easily remove the
> VSyncTimeSource and FrameRateController from the Scheduler.
>
> This patch instantiates the FrameRateController inside of
> OutputSurface for now, but the FrameRateController could be
> removed in future patches.
>
> BUG=245920
> BUG=243497
>
> Review URL: https://chromiumcodereview.appspot.com/15836005
TBR=brianderson@chromium.org
Review URL: https://codereview.chromium.org/16679010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/proxy.h')
| -rw-r--r-- | cc/trees/proxy.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cc/trees/proxy.h b/cc/trees/proxy.h index 4e6171c..aaab780 100644 --- a/cc/trees/proxy.h +++ b/cc/trees/proxy.h @@ -5,8 +5,6 @@ #ifndef CC_TREES_PROXY_H_ #define CC_TREES_PROXY_H_ -#include <string> - #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -100,7 +98,6 @@ class CC_EXPORT Proxy { // Testing hooks virtual bool CommitPendingForTesting() = 0; - virtual std::string SchedulerStateAsStringForTesting(); protected: explicit Proxy(scoped_ptr<Thread> impl_thread); |