Move Contents classes into separate translation units (flutter#53)

egramond · Apr 27, 2022 · c81fbbd · c81fbbd
1 parent 9058956
commit c81fbbd
Show file tree

Hide file tree

Showing 34 changed files with 1,315 additions and 1,118 deletions.
diff --git a/impeller/aiks/aiks_context.h b/impeller/aiks/aiks_context.h
@@ -7,7 +7,7 @@
 #include <memory>
 
 #include "flutter/fml/macros.h"
-#include "impeller/entity/content_context.h"
+#include "impeller/entity/contents/content_context.h"
 #include "impeller/renderer/context.h"
 
 namespace impeller {

diff --git a/impeller/aiks/canvas.cc b/impeller/aiks/canvas.cc
@@ -8,6 +8,9 @@
 
 #include "flutter/fml/logging.h"
 #include "impeller/aiks/paint_pass_delegate.h"
+#include "impeller/entity/contents/clip_contents.h"
+#include "impeller/entity/contents/text_contents.h"
+#include "impeller/entity/contents/texture_contents.h"
 #include "impeller/geometry/path_builder.h"
 
 namespace impeller {

diff --git a/impeller/aiks/canvas.h b/impeller/aiks/canvas.h
@@ -18,6 +18,7 @@
 #include "impeller/geometry/path.h"
 #include "impeller/geometry/point.h"
 #include "impeller/geometry/vector.h"
+#include "impeller/typographer/glyph_atlas.h"
 #include "impeller/typographer/text_frame.h"
 
 namespace impeller {

diff --git a/impeller/aiks/paint.cc b/impeller/aiks/paint.cc
@@ -3,6 +3,8 @@
 // found in the LICENSE file.
 
 #include "impeller/aiks/paint.h"
+#include "impeller/entity/contents/solid_color_contents.h"
+#include "impeller/entity/contents/solid_stroke_contents.h"
 
 namespace impeller {
 

diff --git a/impeller/aiks/paint.h b/impeller/aiks/paint.h
@@ -7,7 +7,7 @@
 #include <memory>
 
 #include "flutter/fml/macros.h"
-#include "impeller/entity/contents.h"
+#include "impeller/entity/contents/contents.h"
 #include "impeller/geometry/color.h"
 
 namespace impeller {

diff --git a/impeller/aiks/paint_pass_delegate.cc b/impeller/aiks/paint_pass_delegate.cc
@@ -4,7 +4,8 @@
 
 #include "impeller/aiks/paint_pass_delegate.h"
 
-#include "impeller/entity/contents.h"
+#include "impeller/entity/contents/contents.h"
+#include "impeller/entity/contents/texture_contents.h"
 
 namespace impeller {
 

diff --git a/impeller/display_list/display_list_dispatcher.cc b/impeller/display_list/display_list_dispatcher.cc
@@ -5,6 +5,7 @@
 #include "impeller/display_list/display_list_dispatcher.h"
 
 #include "flutter/fml/trace_event.h"
+#include "impeller/entity/contents/linear_gradient_contents.h"
 #include "impeller/geometry/path_builder.h"
 #include "impeller/typographer/backends/skia/text_frame_skia.h"
 #include "third_party/skia/include/core/SkColor.h"

diff --git a/impeller/entity/BUILD.gn b/impeller/entity/BUILD.gn
@@ -23,10 +23,22 @@ impeller_shaders("entity_shaders") {
 
 impeller_component("entity") {
   sources = [
-    "content_context.cc",
-    "content_context.h",
-    "contents.cc",
-    "contents.h",
+    "contents/clip_contents.cc",
+    "contents/clip_contents.h",
+    "contents/content_context.cc",
+    "contents/content_context.h",
+    "contents/contents.cc",
+    "contents/contents.h",
+    "contents/linear_gradient_contents.cc",
+    "contents/linear_gradient_contents.h",
+    "contents/solid_color_contents.cc",
+    "contents/solid_color_contents.h",
+    "contents/solid_stroke_contents.cc",
+    "contents/solid_stroke_contents.h",
+    "contents/text_contents.cc",
+    "contents/text_contents.h",
+    "contents/texture_contents.cc",
+    "contents/texture_contents.h",
     "entity.cc",
     "entity.h",
     "entity_pass.cc",