summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/gpu_scheduler.h
diff options
context:
space:
mode:
authorkulkarni.a <kulkarni.a@samsung.com>2014-08-26 01:37:50 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-26 08:38:54 +0000
commit4d18cc81f71b4edf191e359526224080e275d65e (patch)
treef87375262f3be8058c94f5a65e306d77ba587233 /gpu/command_buffer/service/gpu_scheduler.h
parent4c2962cc5cf4301154bf475434b1400432c77527 (diff)
downloadchromium_src-4d18cc81f71b4edf191e359526224080e275d65e.zip
chromium_src-4d18cc81f71b4edf191e359526224080e275d65e.tar.gz
chromium_src-4d18cc81f71b4edf191e359526224080e275d65e.tar.bz2
Declaring the weak_ptr_factory in proper order.
Cleaning up weak_ptr_factory destruction order in "src/gpu" module. WeakPtrFactory should remain the last member so it'll be destroyed and invalidate its weak pointers before any other members are destroyed. BUG=303818 Review URL: https://codereview.chromium.org/468913010 Cr-Commit-Position: refs/heads/master@{#291870}
Diffstat (limited to 'gpu/command_buffer/service/gpu_scheduler.h')
-rw-r--r--gpu/command_buffer/service/gpu_scheduler.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h
index 5e073ca..0390632 100644
--- a/gpu/command_buffer/service/gpu_scheduler.h
+++ b/gpu/command_buffer/service/gpu_scheduler.h
@@ -136,10 +136,6 @@ class GPU_EXPORT GpuScheduler
// account of a timeout.
int rescheduled_count_;
- // A factory for outstanding rescheduling tasks that is invalidated whenever
- // the scheduler is rescheduled.
- base::WeakPtrFactory<GpuScheduler> reschedule_task_factory_;
-
// The GpuScheduler will unschedule itself in the event that further GL calls
// are issued to it before all these fences have been crossed by the GPU.
struct UnscheduleFence {
@@ -160,6 +156,10 @@ class GPU_EXPORT GpuScheduler
scoped_refptr<PreemptionFlag> preemption_flag_;
bool was_preempted_;
+ // A factory for outstanding rescheduling tasks that is invalidated whenever
+ // the scheduler is rescheduled.
+ base::WeakPtrFactory<GpuScheduler> reschedule_task_factory_;
+
DISALLOW_COPY_AND_ASSIGN(GpuScheduler);
};