rename global lock

Author: 0xZOne

fml/raster_thread_merger.cc

@@ -79,7 +79,7 @@ void RasterThreadMerger::MergeWithLease(size_t lease_term) {
 
   // To avoid data races between the platform thread posting sync tasks to the
   // raster thread and the raster thread merging, we add a lock here.
-  std::scoped_lock lock{mutex_, gThreadMergingLock};
+  std::scoped_lock lock{mutex_, g_thread_merging_lock};
   bool success = shared_merger_->MergeWithLease(this, lease_term);
   if (success && merge_unmerge_callback_ != nullptr) {
     merge_unmerge_callback_();

fml/task_runner.cc

@@ -16,7 +16,7 @@
 
 namespace fml {
 
-std::mutex gThreadMergingLock;
+std::mutex g_thread_merging_lock;
 
 TaskRunner::TaskRunner(fml::RefPtr<MessageLoopImpl> loop)
     : loop_(std::move(loop)) {}
@@ -66,7 +66,7 @@ void TaskRunner::RunNowOrPostTask(fml::RefPtr<fml::TaskRunner> runner,
 
 void TaskRunner::RunNowOrPostSyncTask(fml::RefPtr<fml::TaskRunner> runner,
                                       const fml::closure& task) {
-  std::scoped_lock lock(gThreadMergingLock);
+  std::scoped_lock lock(g_thread_merging_lock);
   RunNowOrPostTask(runner, task);
 }
 }  // namespace fml

fml/task_runner.h

@@ -18,7 +18,7 @@ class MessageLoopImpl;
 
 /// To avoid data races between the platform thread posting sync tasks to the
 /// raster thread and the raster thread merging.
-extern std::mutex gThreadMergingLock;
+extern std::mutex g_thread_merging_lock;
 
 /// An interface over the ability to schedule tasks on a \p TaskRunner.
 class BasicTaskRunner {