Index: ui/compositor/layer.h |
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h |
index f9fcbc9208246dbb3eb655747676951ea4f70368..805bc7f80c521f10a51846fd911c08b965e9d055 100644 |
--- a/ui/compositor/layer.h |
+++ b/ui/compositor/layer.h |
@@ -18,6 +18,7 @@ |
#include "third_party/WebKit/Source/Platform/chromium/public/WebContentLayer.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebSolidColorLayer.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayer.h" |
+#include "third_party/WebKit/Source/Platform/chromium/public/WebDelegatedRendererLayer.h" |
#include "third_party/skia/include/core/SkColor.h" |
#include "third_party/skia/include/core/SkRegion.h" |
#include "ui/compositor/compositor.h" |
@@ -29,6 +30,10 @@ |
class SkCanvas; |
+namespace cc { |
+struct TransferableResourceList; |
+} |
+ |
namespace ui { |
class Compositor; |
@@ -222,6 +227,9 @@ class COMPOSITOR_EXPORT Layer |
void SetExternalTexture(ui::Texture* texture); |
ui::Texture* external_texture() { return texture_.get(); } |
+ void SetCompositorFrame(const WebKit::WebCompositorFrame& frame); |
+ void GetRecycledResources(cc::TransferableResourceList* list); |
+ |
// Sets the layer's fill color. May only be called for LAYER_SOLID_COLOR. |
void SetColor(SkColor color); |
@@ -383,6 +391,7 @@ class COMPOSITOR_EXPORT Layer |
scoped_ptr<WebKit::WebContentLayer> content_layer_; |
scoped_ptr<WebKit::WebExternalTextureLayer> texture_layer_; |
scoped_ptr<WebKit::WebSolidColorLayer> solid_color_layer_; |
+ scoped_ptr<WebKit::WebDelegatedRendererLayer> delegated_renderer_layer_; |
WebKit::WebLayer* web_layer_; |
bool web_layer_is_accelerated_; |
bool show_debug_borders_; |