| Index: cc/layer_tree_host.cc
|
| diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc
|
| index 6d61108174b02f7f520ea2721172e6304e1a3d7b..bbace92093c3faab2505f94e690abafd05fdb164 100644
|
| --- a/cc/layer_tree_host.cc
|
| +++ b/cc/layer_tree_host.cc
|
| @@ -37,8 +37,6 @@ static int numLayerTreeInstances;
|
|
|
| namespace cc {
|
|
|
| -bool LayerTreeHost::s_needsFilterContext = false;
|
| -
|
| RendererCapabilities::RendererCapabilities()
|
| : bestTextureFormat(0)
|
| , usingPartialSwap(false)
|
| @@ -49,6 +47,7 @@ RendererCapabilities::RendererCapabilities()
|
| , usingDiscardBackbuffer(false)
|
| , usingEglImage(false)
|
| , allowPartialTextureUpdates(false)
|
| + , usingOffscreenContext3d(false)
|
| , maxTextureSize(0)
|
| , avoidPow2Textures(false)
|
| {
|
| @@ -74,6 +73,7 @@ scoped_ptr<LayerTreeHost> LayerTreeHost::create(LayerTreeHostClient* client, con
|
| LayerTreeHost::LayerTreeHost(LayerTreeHostClient* client, const LayerTreeSettings& settings)
|
| : m_animating(false)
|
| , m_needsFullTreeSync(true)
|
| + , m_needsFilterContext(false)
|
| , m_client(client)
|
| , m_commitNumber(0)
|
| , m_renderingStats()
|
| @@ -184,6 +184,8 @@ LayerTreeHost::RecreateResult LayerTreeHost::recreateOutputSurface()
|
| return RecreateSucceeded;
|
| }
|
|
|
| + m_client->willRetryRecreateOutputSurface();
|
| +
|
| // Tolerate a certain number of recreation failures to work around races
|
| // in the output-surface-lost machinery.
|
| m_numFailedRecreateAttempts++;
|
|
|