Index: cc/surfaces/display.h |
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h |
index 30db259f8f894f99978a054cd5d920119f244d8d..253acb7faa3429611b0e85a597abb4f0e9b8f496 100644 |
--- a/cc/surfaces/display.h |
+++ b/cc/surfaces/display.h |
@@ -30,6 +30,7 @@ namespace cc { |
class BlockingTaskRunner; |
class DirectRenderer; |
class DisplayClient; |
+class DisplayScheduler; |
class OutputSurface; |
class RendererSettings; |
class ResourceProvider; |
@@ -54,12 +55,14 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient, |
const RendererSettings& settings); |
~Display() override; |
- bool Initialize(scoped_ptr<OutputSurface> output_surface); |
+ bool Initialize(scoped_ptr<OutputSurface> output_surface, |
+ DisplayScheduler* scheduler); |
// device_scale_factor is used to communicate to the external window system |
// what scale this was rendered at. |
void SetSurfaceId(SurfaceId id, float device_scale_factor); |
void Resize(const gfx::Size& new_size); |
+ bool CurrentSurfaceHasResources(); |
bool Draw(); |
SurfaceId CurrentSurfaceId(); |
@@ -101,8 +104,10 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient, |
RendererSettings settings_; |
SurfaceId current_surface_id_; |
gfx::Size current_surface_size_; |
+ bool current_surface_has_resources_; |
float device_scale_factor_; |
scoped_ptr<OutputSurface> output_surface_; |
+ DisplayScheduler* scheduler_; |
scoped_ptr<ResourceProvider> resource_provider_; |
scoped_ptr<SurfaceAggregator> aggregator_; |
scoped_ptr<DirectRenderer> renderer_; |