| Index: components/html_viewer/setup.h
|
| diff --git a/components/html_viewer/setup.h b/components/html_viewer/setup.h
|
| index 305ef14dcb1e9341d72d1dcd21c84e6e3c2ff2f8..941f3182468d8f008c38bb61a43e95744c1bf324 100644
|
| --- a/components/html_viewer/setup.h
|
| +++ b/components/html_viewer/setup.h
|
| @@ -10,6 +10,8 @@
|
| #include "base/threading/thread.h"
|
| #include "components/html_viewer/discardable_memory_allocator.h"
|
| #include "components/resource_provider/public/cpp/resource_loader.h"
|
| +#include "components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h"
|
| +#include "components/view_manager/gles2/raster_thread_helper.h"
|
| #include "ui/gfx/geometry/size.h"
|
|
|
| namespace mojo {
|
| @@ -58,6 +60,14 @@ class Setup {
|
| return compositor_thread_.task_runner();
|
| }
|
|
|
| + gles2::RasterThreadHelper* raster_thread_helper() {
|
| + return &raster_thread_helper_;
|
| + }
|
| +
|
| + gles2::MojoGpuMemoryBufferManager* gpu_memory_buffer_manager() {
|
| + return &gpu_memory_buffer_manager_;
|
| + }
|
| +
|
| MediaFactory* media_factory() { return media_factory_.get(); }
|
|
|
| private:
|
| @@ -90,6 +100,8 @@ class Setup {
|
| scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_;
|
| scoped_ptr<BlinkPlatformImpl> blink_platform_;
|
| base::Thread compositor_thread_;
|
| + gles2::RasterThreadHelper raster_thread_helper_;
|
| + gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_;
|
| scoped_ptr<MediaFactory> media_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(Setup);
|
|
|