Roll in CC changes up to 128196

cc/CCLayerTreeHost.h

Index: cc/CCLayerTreeHost.h
diff --git a/cc/CCLayerTreeHost.h b/cc/CCLayerTreeHost.h
index f8cfad367c850a3f4fc541c78ca418ebd5abbed3..6d4c198cd7384becfd111280f3f7d45cfa061de9 100644
--- a/cc/CCLayerTreeHost.h
+++ b/cc/CCLayerTreeHost.h
@@ -191,11 +191,8 @@ public:
 
     CCPrioritizedTextureManager* contentsTextureManager() const;
 
-    // This will cause contents texture manager to evict all textures, but
-    // without deleting them. This happens after all content textures have
-    // already been deleted on impl, after getting a 0 allocation limit.
-    // Set during a commit, but before updateLayers.
-    void evictAllContentTextures();
+    void unlinkAllContentTextures();
+    void deleteUnlinkedTextures();
 
     bool visible() const { return m_visible; }
     void setVisible(bool);