Test and fixes

Author: Emmanuel Garcia

fml/raster_thread_merger_unittests.cc

@@ -579,5 +579,53 @@ TEST(RasterThreadMerger, RunExpiredTasksWhileFirstTaskUnMergesThreads) {
   thread_raster.join();
 }
 
+TEST(RasterThreadMerger, SetMergeUnmergeCallback) {
+  fml::MessageLoop* loop1 = nullptr;
+  fml::AutoResetWaitableEvent latch1;
+  fml::AutoResetWaitableEvent term1;
+  std::thread thread1([&loop1, &latch1, &term1]() {
+    fml::MessageLoop::EnsureInitializedForCurrentThread();
+    loop1 = &fml::MessageLoop::GetCurrent();
+    latch1.Signal();
+    term1.Wait();
+  });
+
+  fml::MessageLoop* loop2 = nullptr;
+  fml::AutoResetWaitableEvent latch2;
+  fml::AutoResetWaitableEvent term2;
+  std::thread thread2([&loop2, &latch2, &term2]() {
+    fml::MessageLoop::EnsureInitializedForCurrentThread();
+    loop2 = &fml::MessageLoop::GetCurrent();
+    latch2.Signal();
+    term2.Wait();
+  });
+
+  latch1.Wait();
+  latch2.Wait();
+
+  fml::TaskQueueId qid1 = loop1->GetTaskRunner()->GetTaskQueueId();
+  fml::TaskQueueId qid2 = loop2->GetTaskRunner()->GetTaskQueueId();
+
+  const auto raster_thread_merger =
+      fml::MakeRefCounted<fml::RasterThreadMerger>(qid1, qid2);
+
+  int callbacks = 0;
+  raster_thread_merger->SetMergeUnmergeCallback(
+      [&callbacks]() { callbacks++; });
+
+  ASSERT_EQ(0, callbacks);
+
+  raster_thread_merger->MergeWithLease(1);
+  ASSERT_EQ(1, callbacks);
+
+  raster_thread_merger->DecrementLease();
+  ASSERT_EQ(2, callbacks);
+
+  term1.Signal();
+  term2.Signal();
+  thread1.join();
+  thread2.join();
+}
+
 }  // namespace testing
 }  // namespace fml

shell/common/rasterizer.cc

@@ -89,14 +89,12 @@ void Rasterizer::Setup(std::unique_ptr<Surface> surface) {
         delegate_.GetTaskRunners().GetRasterTaskRunner()->GetTaskQueueId();
     raster_thread_merger_ =
         fml::MakeRefCounted<fml::RasterThreadMerger>(platform_id, gpu_id);
-
-    raster_thread_merger_->SetMergeUnmergeCallback(
-        [weak_this = weak_factory_.GetWeakPtr()]() {
-          // Clear the GL context after the thread configuration has changed.
-          if (weak_this && weak_this->surface_) {
-            weak_this->surface_->ClearRenderContext();
-          }
-        });
+    raster_thread_merger_->SetMergeUnmergeCallback([=]() {
+      // Clear the GL context after the thread configuration has changed.
+      if (surface_) {
+        surface_->ClearRenderContext();
+      }
+    });
   }
 #endif
 }