Index: cc/thread_proxy.h |
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h |
index 9e383bbc7b0ab6caedc5a5d39272385023498528..09aad76aa69e1ff4d88bed3914e24e1af00535df 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 ui { |
+class ContextProvider; |
+} |
+ |
namespace cc { |
class InputHandler; |
@@ -123,7 +127,7 @@ private: |
bool commitPending; |
}; |
void forceBeginFrameOnImplThread(CompletionEvent*); |
- void beginFrameCompleteOnImplThread(CompletionEvent*, ResourceUpdateQueue*); |
+ void beginFrameCompleteOnImplThread(CompletionEvent*, ResourceUpdateQueue*, scoped_refptr<ui::ContextProvider> offscreenContextProvider); |
void beginFrameAbortedOnImplThread(); |
void requestReadbackOnImplThread(ReadbackRequest*); |
void requestStartPageScaleAnimationOnImplThread(gfx::Vector2d targetOffset, bool useAnchor, float scale, base::TimeDelta duration); |
@@ -137,7 +141,7 @@ private: |
void manageTilesOnImplThread(); |
void setFullRootLayerDamageOnImplThread(); |
void acquireLayerTexturesForMainThreadOnImplThread(CompletionEvent*); |
- void recreateOutputSurfaceOnImplThread(CompletionEvent*, scoped_ptr<OutputSurface>, bool* recreateSucceeded, RendererCapabilities*); |
+ void recreateOutputSurfaceOnImplThread(CompletionEvent*, scoped_ptr<OutputSurface>, scoped_refptr<ui::ContextProvider> offscreenContextProvider, bool* recreateSucceeded, RendererCapabilities*); |
void renderingStatsOnImplThread(CompletionEvent*, RenderingStats*); |
ScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapInternal(bool forcedDraw); |
void forceSerializeOnSwapBuffersOnImplThread(CompletionEvent*); |
@@ -153,6 +157,7 @@ private: |
bool m_animateRequested; // Set only when setNeedsAnimate is called. |
bool m_commitRequested; // Set only when setNeedsCommit is called. |
bool m_commitRequestSentToImplThread; // Set by setNeedsCommit and setNeedsAnimate. |
+ bool m_createdOffscreenContextProvider; // Set by beginFrame. |
base::CancelableClosure m_outputSurfaceRecreationCallback; |
LayerTreeHost* m_layerTreeHost; |
bool m_rendererInitialized; |