From 31087853c97e2d5a3edadd6effa348acaa56753b Mon Sep 17 00:00:00 2001
From: Kaushik Iska <iska.kaushik@gmail.com>
Date: Thu, 9 Sep 2021 11:08:51 -0700
Subject: [PATCH] Revert "RTM must to acquire lock before called IsMergedUnsafe
 (#28514)" (flutter/engine#28533)

---
 engine/src/flutter/fml/raster_thread_merger.cc | 4 +---
 engine/src/flutter/fml/raster_thread_merger.h  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/engine/src/flutter/fml/raster_thread_merger.cc b/engine/src/flutter/fml/raster_thread_merger.cc
index 88b33dc1e77..6110e683bfb 100644
--- a/engine/src/flutter/fml/raster_thread_merger.cc
+++ b/engine/src/flutter/fml/raster_thread_merger.cc
@@ -91,9 +91,7 @@ bool RasterThreadMerger::IsOnPlatformThread() const {
   return MessageLoop::GetCurrentTaskQueueId() == platform_queue_id_;
 }
 
-bool RasterThreadMerger::IsOnRasterizingThread() {
-  std::scoped_lock lock(mutex_);
-
+bool RasterThreadMerger::IsOnRasterizingThread() const {
   if (IsMergedUnSafe()) {
     return IsOnPlatformThread();
   } else {
diff --git a/engine/src/flutter/fml/raster_thread_merger.h b/engine/src/flutter/fml/raster_thread_merger.h
index 3ad4a4e27da..d3babbfe5d1 100644
--- a/engine/src/flutter/fml/raster_thread_merger.h
+++ b/engine/src/flutter/fml/raster_thread_merger.h
@@ -89,7 +89,7 @@ class RasterThreadMerger
   // 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();
+  bool IsOnRasterizingThread() const;
 
   // Returns true if the current thread is the platform thread.
   bool IsOnPlatformThread() const;