DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

RTM must to acquire lock before called IsMergedUnsafe (flutter/engine#28514)

Browse Source 
I was able to reproduce this on a windows machine with 10000 runs
of this test semi-consistently prior to this fix. After this fix
it seems to have stopped happening.

Fixes: https://github.com/flutter/flutter/issues/88464
This commit is contained in:
Kaushik Iska 2021-09-09 06:30:11 -07:00 committed by GitHub
parent d87e6ac094
commit 929de2e3bf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/flutter/fml/raster_thread_merger.cc
View File

@ -91,7 +91,9 @@ bool RasterThreadMerger::IsOnPlatformThread() const {
return MessageLoop::GetCurrentTaskQueueId() == platform_queue_id_;
}
bool RasterThreadMerger::IsOnRasterizingThread() const {
bool RasterThreadMerger::IsOnRasterizingThread() {
std::scoped_lock lock(mutex_);
if (IsMergedUnSafe()) {
return IsOnPlatformThread();
} else {

2
engine/src/flutter/fml/raster_thread_merger.h
View File

@ -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() const;
bool IsOnRasterizingThread();
// Returns true if the current thread is the platform thread.
bool IsOnPlatformThread() const;