| Index: cc/thread_proxy.h
|
| diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
|
| index 9e383bbc7b0ab6caedc5a5d39272385023498528..283cb9557f0bacd182c4a371299a78a519849b9f 100644
|
| --- a/cc/thread_proxy.h
|
| +++ b/cc/thread_proxy.h
|
| @@ -123,7 +123,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);
|
| @@ -137,7 +137,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*);
|
|
|