From fe169020a0654a8aec4c232d3519253929314d9f Mon Sep 17 00:00:00 2001
From: Zachary Anderson <zanderso@users.noreply.github.com>
Date: Fri, 4 Feb 2022 15:29:58 -0800
Subject: [PATCH] Compensate for change to saveLayer (flutter/engine#6)

---
 .../impeller/display_list/display_list_dispatcher.cc        | 6 ++++--
 .../flutter/impeller/display_list/display_list_dispatcher.h | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/engine/src/flutter/impeller/display_list/display_list_dispatcher.cc b/engine/src/flutter/impeller/display_list/display_list_dispatcher.cc
index f5eebf23269..1724ecf2589 100644
--- a/engine/src/flutter/impeller/display_list/display_list_dispatcher.cc
+++ b/engine/src/flutter/impeller/display_list/display_list_dispatcher.cc
@@ -137,8 +137,10 @@ static std::optional<Rect> ToRect(const SkRect* rect) {
 
 // |flutter::Dispatcher|
 void DisplayListDispatcher::saveLayer(const SkRect* bounds,
-                                      bool restore_with_paint) {
-  canvas_.SaveLayer(restore_with_paint ? paint_ : Paint{}, ToRect(bounds));
+                                      const flutter::SaveLayerOptions options) {
+  canvas_.SaveLayer(
+    options.renders_with_attributes() ? paint_ : Paint{},
+    ToRect(bounds));
 }
 
 // |flutter::Dispatcher|
diff --git a/engine/src/flutter/impeller/display_list/display_list_dispatcher.h b/engine/src/flutter/impeller/display_list/display_list_dispatcher.h
index c32f295f6e4..139ed5c6858 100644
--- a/engine/src/flutter/impeller/display_list/display_list_dispatcher.h
+++ b/engine/src/flutter/impeller/display_list/display_list_dispatcher.h
@@ -75,7 +75,8 @@ class DisplayListDispatcher final : public flutter::Dispatcher {
   void save() override;
 
   // |flutter::Dispatcher|
-  void saveLayer(const SkRect* bounds, bool restore_with_paint) override;
+  void saveLayer(const SkRect* bounds,
+                 const flutter::SaveLayerOptions options) override;
 
   // |flutter::Dispatcher|
   void restore() override;