Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: ui/compositor/layer.h

Issue 10915298: Add CCDelegatingRenderer, and corresponding IPCs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/gpu/compositor_output_surface.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « content/renderer/gpu/compositor_output_surface.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698