| Index: trunk/src/content/renderer/gpu/compositor_output_surface.cc
|
| ===================================================================
|
| --- trunk/src/content/renderer/gpu/compositor_output_surface.cc (revision 250809)
|
| +++ trunk/src/content/renderer/gpu/compositor_output_surface.cc (working copy)
|
| @@ -138,7 +138,8 @@
|
| if (!HasClient())
|
| return;
|
| IPC_BEGIN_MESSAGE_MAP(CompositorOutputSurface, message)
|
| - IPC_MESSAGE_HANDLER(ViewMsg_UpdateVSyncParameters, OnUpdateVSyncParameters);
|
| + IPC_MESSAGE_HANDLER(ViewMsg_UpdateVSyncParameters,
|
| + OnUpdateVSyncParametersFromBrowser);
|
| IPC_MESSAGE_HANDLER(ViewMsg_SwapCompositorFrameAck, OnSwapAck);
|
| IPC_MESSAGE_HANDLER(ViewMsg_ReclaimCompositorResources, OnReclaimResources);
|
| #if defined(OS_ANDROID)
|
| @@ -147,10 +148,11 @@
|
| IPC_END_MESSAGE_MAP()
|
| }
|
|
|
| -void CompositorOutputSurface::OnUpdateVSyncParameters(
|
| - base::TimeTicks timebase, base::TimeDelta interval) {
|
| +void CompositorOutputSurface::OnUpdateVSyncParametersFromBrowser(
|
| + base::TimeTicks timebase,
|
| + base::TimeDelta interval) {
|
| DCHECK(CalledOnValidThread());
|
| - OnVSyncParametersChanged(timebase, interval);
|
| + CommitVSyncParameters(timebase, interval);
|
| }
|
|
|
| #if defined(OS_ANDROID)
|
|
|