commit e28ccedfdd14bf1a9fc7f1611e6da49640e432fd
author Kaushik Iska <iska.kaushik@gmail.com> Thu Sep 09 11:24:13 2021 -0700
committer Kaushik Iska <iska.kaushik@gmail.com> Thu Sep 09 11:24:13 2021 -0700
tree 9f2906c6f70469c5084ad6a194b18420fef7b6e6
parent 6a3b04632b570adab455996cf641914dfdf20a9c

Reland "RTM must to acquire lock before called IsMergedUnsafe (#28514)"

This reverts commit bebc83c80c638ca3fad5f51122527ace660a9c7c.

fml/raster_thread_merger.cc

diff --git a/fml/raster_thread_merger.cc b/fml/raster_thread_merger.cc
index 6110e68..88b33dc 100644
--- a/fml/raster_thread_merger.cc
+++ b/fml/raster_thread_merger.cc
@@ -91,7 +91,9 @@
   return MessageLoop::GetCurrentTaskQueueId() == platform_queue_id_;
 }
 
-bool RasterThreadMerger::IsOnRasterizingThread() const {
+bool RasterThreadMerger::IsOnRasterizingThread() {
+  std::scoped_lock lock(mutex_);
+
   if (IsMergedUnSafe()) {
     return IsOnPlatformThread();
   } else {

fml/raster_thread_merger.h

diff --git a/fml/raster_thread_merger.h b/fml/raster_thread_merger.h
index d3babbf..3ad4a4e 100644
--- a/fml/raster_thread_merger.h
+++ b/fml/raster_thread_merger.h
@@ -89,7 +89,7 @@
   // Returns true if the current thread owns rasterizing.
   // When the threads are merged, platform thread owns rasterizing.
   // When un-merged, raster thread owns rasterizing.
-  bool IsOnRasterizingThread() const;
+  bool IsOnRasterizingThread();
 
   // Returns true if the current thread is the platform thread.
   bool IsOnPlatformThread() const;