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

Unified Diff: ui/compositor/layer.h

Issue 26023004: aura: Allow delegated frames to be used by more than one impl layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: frameprovider: fixleak Created 7 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
Index: ui/compositor/layer.h
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h
index d308f607716629d1d0c2ea0cb6f74b39652bc062..a02036f3e9676c82b2cdbc27b5374625eb21545a 100644
--- a/ui/compositor/layer.h
+++ b/ui/compositor/layer.h
@@ -33,7 +33,7 @@ class SkCanvas;
namespace cc {
class ContentLayer;
class CopyOutputRequest;
-class DelegatedFrameData;
+class DelegatedFrameProvider;
class DelegatedRendererLayer;
class Layer;
class ResourceUpdateQueue;
@@ -261,18 +261,14 @@ class COMPOSITOR_EXPORT Layer
float scale_factor);
cc::TextureMailbox GetTextureMailbox(float* scale_factor);
- // Sets a delegated frame, coming from a child compositor.
- void SetDelegatedFrame(scoped_ptr<cc::DelegatedFrameData> frame,
- gfx::Size frame_size_in_dip);
+ // Begins showing delegated frames from the |frame_provider|.
+ void SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider,
+ gfx::Size frame_size_in_dip);
bool has_external_content() {
return texture_layer_.get() || delegated_renderer_layer_.get();
}
- // Gets unused resources to recycle to the child compositor.
- void TakeUnusedResourcesForChildCompositor(
- cc::ReturnedResourceArray* array);
-
void SetShowPaintedContent();
// Sets the layer's fill color. May only be called for LAYER_SOLID_COLOR.

Powered by Google App Engine
This is Rietveld 408576698