Index: gpu/ipc/service/gpu_channel_manager.h |
diff --git a/gpu/ipc/service/gpu_channel_manager.h b/gpu/ipc/service/gpu_channel_manager.h |
index 0ce987a5e6b75eb3d7ad19bebba4ce53f6ab7b09..b0a183acdecf95737c3118ebb08cdec3d07f54e1 100644 |
--- a/gpu/ipc/service/gpu_channel_manager.h |
+++ b/gpu/ipc/service/gpu_channel_manager.h |
@@ -37,7 +37,6 @@ |
class GpuDriverBugWorkarounds; |
struct GpuPreferences; |
class PreemptionFlag; |
-class Scheduler; |
class SyncPointManager; |
struct SyncToken; |
namespace gles2 { |
@@ -65,7 +64,6 @@ |
GpuWatchdogThread* watchdog, |
scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, |
- Scheduler* scheduler, |
SyncPointManager* sync_point_manager, |
GpuMemoryBufferFactory* gpu_memory_buffer_factory, |
const GpuFeatureInfo& gpu_feature_info, |
@@ -124,8 +122,6 @@ |
gl::GLShareGroup* share_group() const { return share_group_.get(); } |
- SyncPointManager* sync_point_manager() const { return sync_point_manager_; } |
- |
private: |
void InternalDestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, int client_id); |
void InternalDestroyGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id, |
@@ -151,12 +147,9 @@ |
GpuWatchdogThread* watchdog_; |
scoped_refptr<gl::GLShareGroup> share_group_; |
- |
+ scoped_refptr<gles2::MailboxManager> mailbox_manager_; |
scoped_refptr<PreemptionFlag> preemption_flag_; |
- |
- scoped_refptr<gles2::MailboxManager> mailbox_manager_; |
GpuMemoryManager gpu_memory_manager_; |
- Scheduler* scheduler_; |
// SyncPointManager guaranteed to outlive running MessageLoop. |
SyncPointManager* sync_point_manager_; |
std::unique_ptr<gles2::ProgramCache> program_cache_; |