Chromium Code Reviews| Index: cc/surfaces/display.h |
| diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h |
| index 57d6af4cd24e81994fceac8fabeb7e0d5ce31cf4..843cab5306ef1c09c9415270963399c4edefb13a 100644 |
| --- a/cc/surfaces/display.h |
| +++ b/cc/surfaces/display.h |
| @@ -5,6 +5,8 @@ |
| #ifndef CC_SURFACES_DISPLAY_H_ |
| #define CC_SURFACES_DISPLAY_H_ |
| +#include <set> |
|
danakj
2014/09/03 16:09:36
?
Sami
2014/09/03 17:59:12
Hmm, looks like a rebasing snafu. Earlier my patch
|
| + |
| #include "base/memory/scoped_ptr.h" |
| #include "cc/output/output_surface_client.h" |
| #include "cc/output/renderer.h" |
| @@ -20,6 +22,7 @@ class Size; |
| namespace cc { |
| +class BlockingTaskRunner; |
| class DirectRenderer; |
| class DisplayClient; |
| class OutputSurface; |
| @@ -88,6 +91,7 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient, |
| scoped_ptr<ResourceProvider> resource_provider_; |
| scoped_ptr<SurfaceAggregator> aggregator_; |
| scoped_ptr<DirectRenderer> renderer_; |
| + scoped_ptr<BlockingTaskRunner> blocking_main_thread_task_runner_; |
| DISALLOW_COPY_AND_ASSIGN(Display); |
| }; |