[scheduler] Split lock in TaskQueueImpl.

third_party/WebKit/Source/platform/scheduler/base/task_queue_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_IMPL_H_
 #define THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_IMPL_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 235 matching lines @@
 
   struct AnyThread {
     AnyThread(TaskQueueManager* task_queue_manager, TimeDomain* time_domain);
     ~AnyThread();
 
     // TaskQueueManager and TimeDomain are maintained in two copies:
     // inside AnyThread and inside MainThreadOnly. They can be changed only from
     // main thread, so it should be locked before accessing from other threads.
     TaskQueueManager* task_queue_manager;
     TimeDomain* time_domain;
-
-    WTF::Deque<Task> immediate_incoming_queue;
   };
 
   struct MainThreadOnly {
     MainThreadOnly(TaskQueueManager* task_queue_manager,
                    TaskQueueImpl* task_queue,
                    TimeDomain* time_domain);
     ~MainThreadOnly();
 
     // Another copy of TaskQueueManager and TimeDomain for lock-free access from
     // the main thread. See description inside struct AnyThread for details.
@@ skipping 43 matching lines @@
       const tracked_objects::Location& posted_from,
       const base::Closure& task,
       base::TimeTicks desired_run_time,
       EnqueueOrder sequence_number,
       bool nestable);
 
   // Extracts all the tasks from the immediate incoming queue and clears it.
   // Can be called from any thread.
   WTF::Deque<TaskQueueImpl::Task> TakeImmediateIncomingQueue();
 
-  void TraceQueueSize(bool is_locked) const;
+  void TraceQueueSize() const;
   static void QueueAsValueInto(const WTF::Deque<Task>& queue,
                                base::trace_event::TracedValue* state);
   static void QueueAsValueInto(const std::priority_queue<Task>& queue,
                                base::trace_event::TracedValue* state);
   static void TaskAsValueInto(const Task& task,
                               base::trace_event::TracedValue* state);
 
   void RemoveQueueEnabledVoter(const QueueEnabledVoterImpl* voter);
   void OnQueueEnabledVoteChanged(bool enabled);
   void EnableOrDisableWithSelector(bool enable);
@@ skipping 20 matching lines @@
   MainThreadOnly main_thread_only_;
   MainThreadOnly& main_thread_only() {
     DCHECK(main_thread_checker_.CalledOnValidThread());
     return main_thread_only_;
   }
   const MainThreadOnly& main_thread_only() const {
     DCHECK(main_thread_checker_.CalledOnValidThread());
     return main_thread_only_;
   }
 
+  mutable base::Lock immediate_incoming_queue_lock_;
+  WTF::Deque<Task> immediate_incoming_queue_;
+  WTF::Deque<Task>& immediate_incoming_queue() {
+    immediate_incoming_queue_lock_.AssertAcquired();
+    return immediate_incoming_queue_;
+  }
+  const WTF::Deque<Task>& immediate_incoming_queue() const {
+    immediate_incoming_queue_lock_.AssertAcquired();
+    return immediate_incoming_queue_;
+  }
+
   const bool should_monitor_quiescence_;
   const bool should_notify_observers_;
   const bool should_report_when_execution_blocked_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskQueueImpl);
 };
 
 }  // namespace internal
 }  // namespace scheduler
 }  // namespace blink
 
 #endif  // THIRD_PARTY_WEBKIT_SOURCE_PLATFORM_SCHEDULER_BASE_TASK_QUEUE_IMPL_H_