cc: Fix lost context handling when using impl-side painting.

cc/layer_tree_host_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer_tree_host_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
@@ skipping 953 matching lines @@
 bool LayerTreeHostImpl::initializeRenderer(scoped_ptr<OutputSurface> outputSurface)
 {
     // Since we will create a new resource provider, we cannot continue to use
     // the old resources (i.e. renderSurfaces and texture IDs). Clear them
     // before we destroy the old resource provider.
     if (rootLayer()) {
         clearRenderSurfaces();
         sendDidLoseOutputSurfaceRecursive(rootLayer());
     }
     // Note: order is important here.
+    m_pendingTree.reset();

[enne (OOO), 2013/01/15 03:36:25]

You should apply the if statement above on line 969 to both the active and
pending tree.  The pending tree can still have non-resource data coming from the
main thread that shouldn't be thrown away.

[reveman, 2013/01/15 04:05:13]

Done.

     m_renderer.reset();
     m_tileManager.reset();
     m_resourceProvider.reset();
     m_outputSurface.reset();
 
     if (!outputSurface->BindToClient(this))
         return false;
 
     scoped_ptr<ResourceProvider> resourceProvider = ResourceProvider::create(outputSurface.get());
     if (!resourceProvider)
@@ skipping 12 matching lines @@
         return false;
 
     setNeedsUpdateDrawProperties();
     m_resourceProvider = resourceProvider.Pass();
     m_outputSurface = outputSurface.Pass();
 
     if (!m_visible)
         m_renderer->setVisible(m_visible);
 
     m_client->onCanDrawStateChanged(canDraw());
+    m_client->onHasPendingTreeStateChanged(pendingTree());

[enne (OOO), 2013/01/15 03:36:25]

This can go away too.

[reveman, 2013/01/15 04:05:13]

Done.

 
     return true;
 }
 
 void LayerTreeHostImpl::setContentsTexturesPurged()
 {
     m_contentsTexturesPurged = true;
     m_client->onCanDrawStateChanged(canDraw());
 }
 
@@ skipping 623 matching lines @@
 }
 
 skia::RefPtr<SkPicture> LayerTreeHostImpl::capturePicture()
 {
     LayerTreeImpl* tree = pendingTree() ? pendingTree() : activeTree();
     LayerImpl* layer = getNonCompositedContentLayerRecursive(tree->RootLayer());
     return layer ? layer->getPicture() : skia::RefPtr<SkPicture>();
 }
 
 }  // namespace cc