| Index: cc/thread_proxy.h
|
| diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
|
| index bf7d445eca781c3766daaa8dcf90210c2f296625..e0efd3cdd6a1361890f3079d3e2c292d01e175d7 100644
|
| --- a/cc/thread_proxy.h
|
| +++ b/cc/thread_proxy.h
|
| @@ -122,7 +122,7 @@ private:
|
| bool commitPending;
|
| };
|
| void forceBeginFrameOnImplThread(CompletionEvent*);
|
| - void beginFrameCompleteOnImplThread(CompletionEvent*, ResourceUpdateQueue*);
|
| + void beginFrameCompleteOnImplThread(CompletionEvent*, ResourceUpdateQueue*, WebKit::WebGraphicsContext3D* offscreenContext3d, GrContext* offscreenGrContext);
|
| void beginFrameAbortedOnImplThread();
|
| void requestReadbackOnImplThread(ReadbackRequest*);
|
| void requestStartPageScaleAnimationOnImplThread(gfx::Vector2d targetOffset, bool useAnchor, float scale, base::TimeDelta duration);
|
| @@ -136,7 +136,7 @@ private:
|
| void manageTilesOnImplThread();
|
| void setFullRootLayerDamageOnImplThread();
|
| void acquireLayerTexturesForMainThreadOnImplThread(CompletionEvent*);
|
| - void recreateOutputSurfaceOnImplThread(CompletionEvent*, scoped_ptr<OutputSurface>, bool* recreateSucceeded, RendererCapabilities*);
|
| + void recreateOutputSurfaceOnImplThread(CompletionEvent*, scoped_ptr<OutputSurface>, WebKit::WebGraphicsContext3D* offscreenContext3d, GrContext* offscreenGrContext, bool* recreateSucceeded, RendererCapabilities*);
|
| void renderingStatsOnImplThread(CompletionEvent*, RenderingStats*);
|
| ScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapInternal(bool forcedDraw);
|
| void forceSerializeOnSwapBuffersOnImplThread(CompletionEvent*);
|
|
|