From 6e0a6320de5d62c27196cc2b3d1327c340a2ae24 Mon Sep 17 00:00:00 2001
From: Kevin Lubick <kjlubick@google.com>
Date: Tue, 14 Mar 2023 14:33:00 -0400
Subject: [PATCH 1/2] Fix forward declares and #includes

---
 common/graphics/persistent_cache.h | 2 ++
 flow/embedded_views.h              | 2 ++
 flow/layers/layer.h                | 2 ++
 flow/layers/layer_tree.h           | 2 ++
 flow/layers/offscreen_surface.h    | 2 ++
 flow/raster_cache.h                | 1 +
 flow/skia_gpu_object.h             | 1 +
 flow/surface.h                     | 2 ++
 8 files changed, 14 insertions(+)

diff --git a/common/graphics/persistent_cache.h b/common/graphics/persistent_cache.h
index cee0254736a28..0b60091f0b802 100644
--- a/common/graphics/persistent_cache.h
+++ b/common/graphics/persistent_cache.h
@@ -15,6 +15,8 @@
 #include "flutter/fml/unique_fd.h"
 #include "third_party/skia/include/gpu/GrContextOptions.h"
 
+class GrDirectContext;
+
 namespace flutter {
 
 namespace testing {
diff --git a/flow/embedded_views.h b/flow/embedded_views.h
index 835ce854fcaf3..b0a17471cd8fe 100644
--- a/flow/embedded_views.h
+++ b/flow/embedded_views.h
@@ -22,6 +22,8 @@
 #include "third_party/skia/include/core/SkSize.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
+class GrDirectContext;
+
 namespace flutter {
 
 enum MutatorType {
diff --git a/flow/layers/layer.h b/flow/layers/layer.h
index f65719574ca8d..fb6f8b95b5883 100644
--- a/flow/layers/layer.h
+++ b/flow/layers/layer.h
@@ -33,6 +33,8 @@
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/skia/include/utils/SkNWayCanvas.h"
 
+class GrDirectContext;
+
 namespace flutter {
 
 namespace testing {
diff --git a/flow/layers/layer_tree.h b/flow/layers/layer_tree.h
index fba4180975e44..a39cc2360076f 100644
--- a/flow/layers/layer_tree.h
+++ b/flow/layers/layer_tree.h
@@ -17,6 +17,8 @@
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkSize.h"
 
+class GrDirectContext;
+
 namespace flutter {
 
 class LayerTree {
diff --git a/flow/layers/offscreen_surface.h b/flow/layers/offscreen_surface.h
index 091906415d004..54e2fd2f6b017 100644
--- a/flow/layers/offscreen_surface.h
+++ b/flow/layers/offscreen_surface.h
@@ -12,6 +12,8 @@
 #include "flutter/display_list/skia/dl_sk_canvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
+class GrDirectContext;
+
 namespace flutter {
 
 class OffscreenSurface {
diff --git a/flow/raster_cache.h b/flow/raster_cache.h
index c66cf3eeac2ab..ea2f5b1829e66 100644
--- a/flow/raster_cache.h
+++ b/flow/raster_cache.h
@@ -19,6 +19,7 @@
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSize.h"
 
+class GrDirectContext;
 class SkColorSpace;
 
 namespace flutter {
diff --git a/flow/skia_gpu_object.h b/flow/skia_gpu_object.h
index 16251ec56f823..6c1fb78071645 100644
--- a/flow/skia_gpu_object.h
+++ b/flow/skia_gpu_object.h
@@ -14,6 +14,7 @@
 #include "flutter/fml/trace_event.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/gpu/GrDirectContext.h"
+#include "third_party/skia/include/gpu/GrBackendSurface.h"
 
 namespace flutter {
 
diff --git a/flow/surface.h b/flow/surface.h
index 432987b50f207..5cc5d6def08a1 100644
--- a/flow/surface.h
+++ b/flow/surface.h
@@ -12,6 +12,8 @@
 #include "flutter/flow/surface_frame.h"
 #include "flutter/fml/macros.h"
 
+class GrDirectContext;
+
 namespace impeller {
 class AiksContext;
 }  // namespace impeller

From 929182013c17f3eb2241e64f3a1b3f443d850838 Mon Sep 17 00:00:00 2001
From: Kevin Lubick <kjlubick@google.com>
Date: Tue, 14 Mar 2023 14:34:19 -0400
Subject: [PATCH 2/2] presubmit

---
 flow/skia_gpu_object.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flow/skia_gpu_object.h b/flow/skia_gpu_object.h
index 6c1fb78071645..8b577827e89d6 100644
--- a/flow/skia_gpu_object.h
+++ b/flow/skia_gpu_object.h
@@ -13,8 +13,8 @@
 #include "flutter/fml/task_runner.h"
 #include "flutter/fml/trace_event.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
-#include "third_party/skia/include/gpu/GrDirectContext.h"
 #include "third_party/skia/include/gpu/GrBackendSurface.h"
+#include "third_party/skia/include/gpu/GrDirectContext.h"
 
 namespace flutter {