diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-25 15:09:11 +0200 |
| commit | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (patch) | |
| tree | b7abd9f49ae1d4d2e426a5883bfccd42b8e2ee12 /Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h | |
| parent | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (diff) | |
| download | qtwebkit-a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd.tar.gz | |
Imported WebKit commit eb5c1b8fe4d4b1b90b5137433fc58a91da0e6878 (http://svn.webkit.org/repository/webkit/trunk@118516)
Diffstat (limited to 'Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h b/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h index 9ff581ef9..9d2edda6f 100644 --- a/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h +++ b/Source/WebCore/platform/graphics/chromium/cc/CCThreadProxy.h @@ -65,9 +65,9 @@ public: virtual void loseContext() OVERRIDE; virtual void setNeedsAnimate() OVERRIDE; virtual void setNeedsCommit() OVERRIDE; + virtual void setNeedsForcedCommit() OVERRIDE; virtual void setNeedsRedraw() OVERRIDE; virtual bool commitRequested() const OVERRIDE; - virtual void setVisible(bool) OVERRIDE; virtual void didAddAnimation() OVERRIDE { } virtual void start() OVERRIDE; virtual void stop() OVERRIDE; @@ -138,7 +138,6 @@ private: void setSurfaceReadyOnImplThread(); void initializeContextOnImplThread(GraphicsContext3D*); void initializeLayerRendererOnImplThread(CCCompletionEvent*, bool* initializeSucceeded, LayerRendererCapabilities*); - void setVisibleOnImplThread(CCCompletionEvent*, bool visible); void layerTreeHostClosedOnImplThread(CCCompletionEvent*); void setFullRootLayerDamageOnImplThread(); void acquireLayerTexturesForMainThreadOnImplThread(CCCompletionEvent*); @@ -146,10 +145,12 @@ private: CCScheduledActionDrawAndSwapResult scheduledActionDrawAndSwapInternal(bool forcedDraw); void setFontAtlasOnImplThread(PassOwnPtr<CCFontAtlas>); void forceSerializeOnSwapBuffersOnImplThread(CCCompletionEvent*); + void setNeedsForcedCommitOnImplThread(); // Accessed on main thread only. bool m_animateRequested; bool m_commitRequested; + bool m_forcedCommitRequested; bool m_contextLost; OwnPtr<CCThreadProxyContextRecreationTimer> m_contextRecreationTimer; CCLayerTreeHost* m_layerTreeHost; |