Index: cc/thread_proxy.h |
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h |
index 9223933bd9f36f7ccac21188b2ef913fd6e560f5..5971260248519986f9e1ae050583fcd6992f6aab 100644 |
--- a/cc/thread_proxy.h |
+++ b/cc/thread_proxy.h |
@@ -15,6 +15,10 @@ |
#include "cc/resource_update_controller.h" |
#include "cc/scheduler.h" |
+namespace WebKit { |
+class WebGraphicsContext3D; |
+} |
+ |
namespace cc { |
class InputHandler; |
@@ -122,7 +126,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 +140,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*); |
@@ -158,6 +162,7 @@ private: |
bool m_texturesAcquired; |
bool m_inCompositeAndReadback; |
bool m_manageTilesPending; |
+ |
// Weak pointer to use when posting tasks to the impl thread. |
base::WeakPtr<ThreadProxy> m_implThreadWeakPtr; |