Keeping track of descendants that draw content instead of recalcualting

cc/layers/surface_layer.cc

Index: cc/layers/surface_layer.cc
diff --git a/cc/layers/surface_layer.cc b/cc/layers/surface_layer.cc
index f345b7423ddbe58e0665bd8d5740a343ca9ef08e..a042a49850dbb114fd3a04a8c90e16e7f9bb8745 100644
--- a/cc/layers/surface_layer.cc
+++ b/cc/layers/surface_layer.cc
@@ -19,6 +19,7 @@ SurfaceLayer::~SurfaceLayer() {}
 
 void SurfaceLayer::SetSurfaceId(SurfaceId surface_id) {
   surface_id_ = surface_id;
+  UpdateDrawsContent();
   SetNeedsPushProperties();
 }
 
@@ -26,8 +27,8 @@ scoped_ptr<LayerImpl> SurfaceLayer::CreateLayerImpl(LayerTreeImpl* tree_impl) {
   return SurfaceLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
 }
 
-bool SurfaceLayer::DrawsContent() const {
-  return !surface_id_.is_null() && Layer::DrawsContent();
+bool SurfaceLayer::HasDrawableContent() const {
+  return !surface_id_.is_null() && Layer::HasDrawableContent();
 }
 
 void SurfaceLayer::PushPropertiesTo(LayerImpl* layer) {