summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--gpu/command_buffer/service/gpu_scheduler.cc4
-rw-r--r--gpu/command_buffer/service/gpu_scheduler.h8
3 files changed, 7 insertions, 6 deletions
diff --git a/AUTHORS b/AUTHORS
index 6379463..7e5c3ab 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -46,6 +46,7 @@ Antonio Gomes <a1.gomes@sisa.samsung.com>
Arnaud Renevier <a.renevier@samsung.com>
Arpita Bahuguna <a.bah@samsung.com>
Arthur Lussos <developer0420@gmail.com>
+Arun Kulkarni <kulkarni.a@samsung.com>
Arun Mankuzhi <arun.m@samsung.com>
Arunoday Sarkar <a.sarkar.arun@gmail.com>
Arunprasad Rajkumar <ararunprasad@gmail.com>
diff --git a/gpu/command_buffer/service/gpu_scheduler.cc b/gpu/command_buffer/service/gpu_scheduler.cc
index 26b3121..c9936ed 100644
--- a/gpu/command_buffer/service/gpu_scheduler.cc
+++ b/gpu/command_buffer/service/gpu_scheduler.cc
@@ -36,8 +36,8 @@ GpuScheduler::GpuScheduler(CommandBufferServiceBase* command_buffer,
decoder_(decoder),
unscheduled_count_(0),
rescheduled_count_(0),
- reschedule_task_factory_(this),
- was_preempted_(false) {}
+ was_preempted_(false),
+ reschedule_task_factory_(this) {}
GpuScheduler::~GpuScheduler() {
}
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);
};