Always set the callback during Rasterizer setup (flutter#20976)

gspencergoog · Sep 3, 2020 · 3f05b52 · 3f05b52
1 parent 68b7b84
commit 3f05b52
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
@@ -89,6 +89,8 @@ void Rasterizer::Setup(std::unique_ptr<Surface> surface) {
         delegate_.GetTaskRunners().GetRasterTaskRunner()->GetTaskQueueId();
     raster_thread_merger_ =
         fml::MakeRefCounted<fml::RasterThreadMerger>(platform_id, gpu_id);
+  }
+  if (raster_thread_merger_) {
     raster_thread_merger_->SetMergeUnmergeCallback([=]() {
       // Clear the GL context after the thread configuration has changed.
       if (surface_) {