Use Surfaces to hold delegated renderer contents.

ui/compositor/layer.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_COMPOSITOR_LAYER_H_
 #define UI_COMPOSITOR_LAYER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/animation/animation_events.h"
 #include "cc/animation/layer_animation_event_observer.h"
 #include "cc/base/scoped_ptr_vector.h"
 #include "cc/layers/content_layer_client.h"
 #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"
 #include "ui/compositor/layer_animation_delegate.h"
 #include "ui/compositor/layer_delegate.h"
 #include "ui/compositor/layer_type.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 
 class SkCanvas;
 
 namespace cc {
 class ContentLayer;
 class CopyOutputRequest;
 class DelegatedFrameProvider;
 class DelegatedRendererLayer;
 class Layer;
 class NinePatchLayer;
 class ResourceUpdateQueue;
 class SolidColorLayer;
+class SurfaceLayer;
 class TextureLayer;
 struct ReturnedResource;
 typedef std::vector<ReturnedResource> ReturnedResourceArray;
 }
 
 namespace ui {
 
 class Compositor;
 class LayerAnimator;
 class LayerOwner;
@@ skipping 212 matching lines @@
   // shared memory resource or an actual mailbox for a texture.
   void SetTextureMailbox(const cc::TextureMailbox& mailbox,
                          scoped_ptr<cc::SingleReleaseCallback> release_callback,
                          gfx::Size texture_size_in_dip);
   void SetTextureSize(gfx::Size texture_size_in_dip);
 
   // Begins showing delegated frames from the |frame_provider|.
   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();
 
   // Sets the layer's fill color.  May only be called for LAYER_SOLID_COLOR.
   void SetColor(SkColor color);
 
   // Updates the nine patch layer's bitmap and aperture. May only be called for
   // LAYER_NINE_PATCH.
   void UpdateNinePatchLayerBitmap(const SkBitmap& bitmap,
@@ skipping 193 matching lines @@
   // added to a tree.
   cc::ScopedPtrVector<cc::Animation> pending_threaded_animations_;
 
   // Ownership of the layer is held through one of the strongly typed layer
   // pointers, depending on which sort of layer this is.
   scoped_refptr<cc::Layer> content_layer_;
   scoped_refptr<cc::NinePatchLayer> nine_patch_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()|.
   float device_scale_factor_;
 
   // The mailbox used by texture_layer_.
   cc::TextureMailbox mailbox_;
 
   // The callback to release the mailbox. This is only set after
   // SetTextureMailbox is called, before we give it to the TextureLayer.
   scoped_ptr<cc::SingleReleaseCallback> mailbox_release_callback_;
 
   // The size of the frame or texture in DIP, set when SetShowDelegatedContent
   // or SetTextureMailbox was called.
   gfx::Size frame_size_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_H_