diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 05:26:08 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 05:26:08 +0000 |
| commit | 199e9257d7e6da23084e5ce1d971612bf8ad4c5a (patch) | |
| tree | ee93ee2ebb2cb3e5b4d329246c2a953183d30776 /cc/scheduler.cc | |
| parent | 1de414e56ef482f10f3e37ec39d0812960065614 (diff) | |
| download | chromium_src-199e9257d7e6da23084e5ce1d971612bf8ad4c5a.zip chromium_src-199e9257d7e6da23084e5ce1d971612bf8ad4c5a.tar.gz chromium_src-199e9257d7e6da23084e5ce1d971612bf8ad4c5a.tar.bz2 | |
Revert 171403
cc_unittests is failing. Looks like something conflicted with this.
> cc: Finish the rename from cc::GraphicsContext to cc::OutputSurface
>
> It is far too confusing to deal with OutputSurface code when half the time it is
> called a GraphicsContext in correctly. Cleaning this up so I can think about the
> code properly as I upstream the Ubercomp CL.
>
> NOTRY=true
> R=jamesr,piman
> BUG=146080
>
>
> Review URL: https://chromiumcodereview.appspot.com/11450019
TBR=danakj@chromium.org
Review URL: https://codereview.chromium.org/11439026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/scheduler.cc')
| -rw-r--r-- | cc/scheduler.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cc/scheduler.cc b/cc/scheduler.cc index 099708a..ed2884f 100644 --- a/cc/scheduler.cc +++ b/cc/scheduler.cc @@ -104,18 +104,18 @@ void Scheduler::didSwapBuffersComplete() m_frameRateController->didFinishFrame(); } -void Scheduler::didLoseOutputSurface() +void Scheduler::didLoseContext() { - TRACE_EVENT0("cc", "Scheduler::didLoseOutputSurface"); + TRACE_EVENT0("cc", "Scheduler::didLoseContext"); m_frameRateController->didAbortAllPendingFrames(); - m_stateMachine.didLoseOutputSurface(); + m_stateMachine.didLoseContext(); processScheduledActions(); } -void Scheduler::didRecreateOutputSurface() +void Scheduler::didRecreateContext() { - TRACE_EVENT0("cc", "Scheduler::didRecreateOutputSurface"); - m_stateMachine.didRecreateOutputSurface(); + TRACE_EVENT0("cc", "Scheduler::didRecreateContext"); + m_stateMachine.didRecreateContext(); processScheduledActions(); } @@ -174,7 +174,7 @@ void Scheduler::processScheduledActions() if (result.didSwap) m_frameRateController->didBeginFrame(); break; - } case SchedulerStateMachine::ACTION_BEGIN_OUTPUT_SURFACE_RECREATION: + } case SchedulerStateMachine::ACTION_BEGIN_CONTEXT_RECREATION: m_client->scheduledActionBeginContextRecreation(); break; case SchedulerStateMachine::ACTION_ACQUIRE_LAYER_TEXTURES_FOR_MAIN_THREAD: |