OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ | 5 #ifndef COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ |
6 #define COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ | 6 #define COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
11 #include "components/html_viewer/discardable_memory_allocator.h" | 11 #include "components/html_viewer/discardable_memory_allocator.h" |
12 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h" | 12 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h" |
13 #include "components/mus/gles2/raster_thread_helper.h" | 13 #include "components/mus/gles2/raster_thread_helper.h" |
14 #include "components/resource_provider/public/cpp/resource_loader.h" | 14 #include "components/resource_provider/public/cpp/resource_loader.h" |
| 15 #include "skia/ext/refptr.h" |
15 #include "ui/gfx/geometry/size.h" | 16 #include "ui/gfx/geometry/size.h" |
16 | 17 |
| 18 namespace font_service { |
| 19 class FontLoader; |
| 20 } |
| 21 |
17 namespace mojo { | 22 namespace mojo { |
18 class ApplicationImpl; | 23 class ApplicationImpl; |
19 class Shell; | 24 class Shell; |
20 } | 25 } |
21 | 26 |
22 namespace ui { | 27 namespace ui { |
23 namespace mojo { | 28 namespace mojo { |
24 class UIInit; | 29 class UIInit; |
25 } | 30 } |
26 } | 31 } |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
100 // memory based purging allocator working here. | 105 // memory based purging allocator working here. |
101 DiscardableMemoryAllocator discardable_memory_allocator_; | 106 DiscardableMemoryAllocator discardable_memory_allocator_; |
102 | 107 |
103 scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_; | 108 scoped_ptr<scheduler::RendererScheduler> renderer_scheduler_; |
104 scoped_ptr<BlinkPlatformImpl> blink_platform_; | 109 scoped_ptr<BlinkPlatformImpl> blink_platform_; |
105 base::Thread compositor_thread_; | 110 base::Thread compositor_thread_; |
106 gles2::RasterThreadHelper raster_thread_helper_; | 111 gles2::RasterThreadHelper raster_thread_helper_; |
107 gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_; | 112 gles2::MojoGpuMemoryBufferManager gpu_memory_buffer_manager_; |
108 scoped_ptr<MediaFactory> media_factory_; | 113 scoped_ptr<MediaFactory> media_factory_; |
109 | 114 |
| 115 #if defined(OS_LINUX) && !defined(OS_ANDROID) |
| 116 skia::RefPtr<font_service::FontLoader> font_loader_; |
| 117 #endif |
| 118 |
110 DISALLOW_COPY_AND_ASSIGN(GlobalState); | 119 DISALLOW_COPY_AND_ASSIGN(GlobalState); |
111 }; | 120 }; |
112 | 121 |
113 } // namespace html_viewer | 122 } // namespace html_viewer |
114 | 123 |
115 #endif // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ | 124 #endif // COMPONENTS_HTML_VIEWER_GLOBAL_STATE_H_ |
OLD | NEW |