From 361e18a4c50c3b6194aaf4f274161a0d12cb414e Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Thu, 3 Sep 2020 10:02:14 -0700
Subject: [PATCH] Always set the callback during Rasterizer setup

---
 shell/common/rasterizer.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shell/common/rasterizer.cc b/shell/common/rasterizer.cc
index e5ed67dcd0935..36eee5e174d06 100644
--- 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_) {