Skip to content

Commit c81fbbd

Browse files
bderodnfield
authored andcommitted
Move Contents classes into separate translation units (flutter#53)
1 parent 9058956 commit c81fbbd

34 files changed

+1315
-1118
lines changed

impeller/aiks/aiks_context.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <memory>
88

99
#include "flutter/fml/macros.h"
10-
#include "impeller/entity/content_context.h"
10+
#include "impeller/entity/contents/content_context.h"
1111
#include "impeller/renderer/context.h"
1212

1313
namespace impeller {

impeller/aiks/canvas.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
#include "flutter/fml/logging.h"
1010
#include "impeller/aiks/paint_pass_delegate.h"
11+
#include "impeller/entity/contents/clip_contents.h"
12+
#include "impeller/entity/contents/text_contents.h"
13+
#include "impeller/entity/contents/texture_contents.h"
1114
#include "impeller/geometry/path_builder.h"
1215

1316
namespace impeller {

impeller/aiks/canvas.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "impeller/geometry/path.h"
1919
#include "impeller/geometry/point.h"
2020
#include "impeller/geometry/vector.h"
21+
#include "impeller/typographer/glyph_atlas.h"
2122
#include "impeller/typographer/text_frame.h"
2223

2324
namespace impeller {

impeller/aiks/paint.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// found in the LICENSE file.
44

55
#include "impeller/aiks/paint.h"
6+
#include "impeller/entity/contents/solid_color_contents.h"
7+
#include "impeller/entity/contents/solid_stroke_contents.h"
68

79
namespace impeller {
810

impeller/aiks/paint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <memory>
88

99
#include "flutter/fml/macros.h"
10-
#include "impeller/entity/contents.h"
10+
#include "impeller/entity/contents/contents.h"
1111
#include "impeller/geometry/color.h"
1212

1313
namespace impeller {

impeller/aiks/paint_pass_delegate.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
#include "impeller/aiks/paint_pass_delegate.h"
66

7-
#include "impeller/entity/contents.h"
7+
#include "impeller/entity/contents/contents.h"
8+
#include "impeller/entity/contents/texture_contents.h"
89

910
namespace impeller {
1011

impeller/display_list/display_list_dispatcher.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include "impeller/display_list/display_list_dispatcher.h"
66

77
#include "flutter/fml/trace_event.h"
8+
#include "impeller/entity/contents/linear_gradient_contents.h"
89
#include "impeller/geometry/path_builder.h"
910
#include "impeller/typographer/backends/skia/text_frame_skia.h"
1011
#include "third_party/skia/include/core/SkColor.h"

impeller/entity/BUILD.gn

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,22 @@ impeller_shaders("entity_shaders") {
2323

2424
impeller_component("entity") {
2525
sources = [
26-
"content_context.cc",
27-
"content_context.h",
28-
"contents.cc",
29-
"contents.h",
26+
"contents/clip_contents.cc",
27+
"contents/clip_contents.h",
28+
"contents/content_context.cc",
29+
"contents/content_context.h",
30+
"contents/contents.cc",
31+
"contents/contents.h",
32+
"contents/linear_gradient_contents.cc",
33+
"contents/linear_gradient_contents.h",
34+
"contents/solid_color_contents.cc",
35+
"contents/solid_color_contents.h",
36+
"contents/solid_stroke_contents.cc",
37+
"contents/solid_stroke_contents.h",
38+
"contents/text_contents.cc",
39+
"contents/text_contents.h",
40+
"contents/texture_contents.cc",
41+
"contents/texture_contents.h",
3042
"entity.cc",
3143
"entity.h",
3244
"entity_pass.cc",

0 commit comments

Comments
 (0)