Use Surfaces to hold delegated renderer contents.

ui/compositor/layer.h

Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index e0a545f9ce930406d83a6416a6066b1c1934f3a4..6af9cd766abe662107f5e2f6a85908458cf779bf 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -19,6 +19,7 @@
 #include "cc/layers/layer_client.h"
 #include "cc/layers/texture_layer_client.h"
 #include "cc/resources/texture_mailbox.h"
+#include "cc/surfaces/surface_id.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/compositor/compositor.h"
@@ -39,6 +40,7 @@ class Layer;
 class NinePatchLayer;
 class ResourceUpdateQueue;
 class SolidColorLayer;
+class SurfaceLayer;
 class TextureLayer;
 struct ReturnedResource;
 typedef std::vector<ReturnedResource> ReturnedResourceArray;
@@ -271,8 +273,12 @@ class COMPOSITOR_EXPORT Layer
   void SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider,
                                gfx::Size frame_size_in_dip);
 
+  // Begins showing content from a surface with a particular id.
+  void SetShowSurface(cc::SurfaceId id, gfx::Size frame_size_in_dip);
+
   bool has_external_content() {
-    return texture_layer_.get() || delegated_renderer_layer_.get();
+    return texture_layer_.get() || delegated_renderer_layer_.get() ||
+           surface_layer_.get();
   }
 
   void SetShowPaintedContent();
@@ -486,6 +492,7 @@ class COMPOSITOR_EXPORT Layer
   scoped_refptr<cc::TextureLayer> texture_layer_;
   scoped_refptr<cc::SolidColorLayer> solid_color_layer_;
   scoped_refptr<cc::DelegatedRendererLayer> delegated_renderer_layer_;
+  scoped_refptr<cc::SurfaceLayer> surface_layer_;
   cc::Layer* cc_layer_;
 
   // A cached copy of |Compositor::device_scale_factor()|.