Skip to content

Commit 336c23f

Browse files
chinmaygardechinmaygarde
authored
Remove //flutter/glue and use FML directly. (flutter#5862)
1 parent 7d17da7 commit 336c23f

32 files changed

+42
-131
lines changed

‎assets/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ source_set("assets") {
1616
deps = [
1717
"$flutter_root/common",
1818
"$flutter_root/fml",
19-
"$flutter_root/glue",
2019
"//garnet/public/lib/fxl",
2120
]
2221

‎assets/asset_manager.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "flutter/assets/asset_manager.h"
66

77
#include "flutter/assets/directory_asset_bundle.h"
8-
#include "flutter/glue/trace_event.h"
8+
#include "flutter/fml/trace_event.h"
99

1010
#ifdef ERROR
1111
#undef ERROR

‎assets/zip_asset_store.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <string>
1515
#include <utility>
1616

17-
#include "flutter/glue/trace_event.h"
17+
#include "flutter/fml/trace_event.h"
1818

1919
namespace blink {
2020

‎flow/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ source_set("flow") {
6767
deps = [
6868
"$flutter_root/common",
6969
"$flutter_root/fml",
70-
"$flutter_root/glue",
7170
"$flutter_root/synchronization",
7271
"//third_party/skia",
7372
"//third_party/skia:gpu",

‎flow/layers/layer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "flutter/flow/instrumentation.h"
1212
#include "flutter/flow/raster_cache.h"
1313
#include "flutter/flow/texture.h"
14-
#include "flutter/glue/trace_event.h"
14+
#include "flutter/fml/trace_event.h"
1515
#include "lib/fxl/build_config.h"
1616
#include "lib/fxl/logging.h"
1717
#include "lib/fxl/macros.h"

‎flow/layers/layer_tree.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "flutter/flow/layers/layer_tree.h"
66

77
#include "flutter/flow/layers/layer.h"
8-
#include "flutter/glue/trace_event.h"
8+
#include "flutter/fml/trace_event.h"
99
#include "third_party/skia/include/core/SkPictureRecorder.h"
1010

1111
namespace flow {

‎flow/raster_cache.cc

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

99
#include "flutter/flow/paint_utils.h"
10-
#include "flutter/glue/trace_event.h"
10+
#include "flutter/fml/trace_event.h"
1111
#include "lib/fxl/logging.h"
1212
#include "third_party/skia/include/core/SkCanvas.h"
1313
#include "third_party/skia/include/core/SkColorSpaceXformCanvas.h"

‎flow/scene_update_context.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "flutter/flow/export_node.h"
88
#include "flutter/flow/layers/layer.h"
99
#include "flutter/flow/matrix_decomposition.h"
10-
#include "flutter/glue/trace_event.h"
10+
#include "flutter/fml/trace_event.h"
1111

1212
namespace flow {
1313

@@ -94,7 +94,7 @@ void SceneUpdateContext::CreateFrame(scenic::EntityNode& entity_node,
9494
SetShapeColor(shape_node, color);
9595

9696
scenic::Rectangle inner_shape(session_, inner_bounds.width(),
97-
inner_bounds.height());
97+
inner_bounds.height());
9898
scenic::ShapeNode inner_node(session_);
9999
inner_node.SetShape(inner_shape);
100100
inner_node.SetTranslation(inner_bounds.width() * 0.5f + inner_bounds.left(),

‎fml/trace_event.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,22 @@
55
#ifndef FLUTTER_FML_TRACE_EVENT_H_
66
#define FLUTTER_FML_TRACE_EVENT_H_
77

8+
#if defined(__Fuchsia__)
9+
10+
// Forward to the system tracing mechanism on Fuchsia.
11+
12+
#include <trace/event.h>
13+
14+
#define TRACE_EVENT0(a, b) TRACE_DURATION(a, b)
15+
#define TRACE_EVENT1(a, b, c, d) TRACE_DURATION(a, b, c, d)
16+
#define TRACE_EVENT2(a, b, c, d, e, f) TRACE_DURATION(a, b, c, d, e, f)
17+
#define TRACE_EVENT_ASYNC_BEGIN0(a, b, c) TRACE_ASYNC_BEGIN(a, b, c)
18+
#define TRACE_EVENT_ASYNC_END0(a, b, c) TRACE_ASYNC_END(a, b, c)
19+
#define TRACE_EVENT_ASYNC_BEGIN1(a, b, c, d, e) TRACE_ASYNC_BEGIN(a, b, c, d, e)
20+
#define TRACE_EVENT_ASYNC_END1(a, b, c, d, e) TRACE_ASYNC_END(a, b, c, d, e)
21+
22+
#else // defined(__Fuchsia__)
23+
824
#include <cstddef>
925
#include <cstdint>
1026
#include <string>
@@ -121,4 +137,6 @@ class ScopedInstantEnd {
121137
} // namespace tracing
122138
} // namespace fml
123139

140+
#endif // defined(__Fuchsia__)
141+
124142
#endif // FLUTTER_FML_TRACE_EVENT_H_

‎glue/BUILD.gn

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎glue/README.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎glue/stack_trace.h

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎glue/stack_trace_base.cc

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎glue/stack_trace_fuchsia.cc

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎glue/trace_event.h

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎lib/ui/BUILD.gn

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ source_set("ui") {
5555
"painting/vertices.h",
5656
"plugins/callback_cache.cc",
5757
"plugins/callback_cache.h",
58+
"semantics/custom_accessibility_action.cc",
59+
"semantics/custom_accessibility_action.h",
5860
"semantics/semantics_node.cc",
5961
"semantics/semantics_node.h",
6062
"semantics/semantics_update.cc",
6163
"semantics/semantics_update.h",
6264
"semantics/semantics_update_builder.cc",
6365
"semantics/semantics_update_builder.h",
64-
"semantics/custom_accessibility_action.cc",
65-
"semantics/custom_accessibility_action.h",
6666
"text/asset_manager_font_provider.cc",
6767
"text/asset_manager_font_provider.h",
6868
"text/font_collection.cc",
@@ -101,7 +101,6 @@ source_set("ui") {
101101
"$flutter_root/common",
102102
"$flutter_root/flow",
103103
"$flutter_root/fml",
104-
"$flutter_root/glue",
105104
"$flutter_root/runtime:test_font",
106105
"//garnet/public/lib/fxl",
107106
"//third_party/dart/runtime/bin:embedded_dart_io",
@@ -115,5 +114,7 @@ source_set("ui") {
115114
deps += [ "//topaz/public/dart-pkg/zircon" ]
116115
}
117116

118-
public_deps = ["$flutter_root/third_party/txt"]
117+
public_deps = [
118+
"$flutter_root/third_party/txt",
119+
]
119120
}

‎lib/ui/compositing/scene.cc

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

55
#include "flutter/lib/ui/compositing/scene.h"
66

7-
#include "flutter/glue/trace_event.h"
7+
#include "flutter/fml/trace_event.h"
88
#include "flutter/lib/ui/painting/image.h"
99
#include "lib/fxl/functional/make_copyable.h"
1010
#include "third_party/skia/include/core/SkImageInfo.h"

‎lib/ui/painting/codec.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "flutter/lib/ui/painting/codec.h"
66

77
#include "flutter/common/task_runners.h"
8-
#include "flutter/glue/trace_event.h"
8+
#include "flutter/fml/trace_event.h"
99
#include "flutter/lib/ui/painting/frame_info.h"
1010
#include "lib/fxl/functional/make_copyable.h"
1111
#include "lib/fxl/logging.h"

‎lib/ui/painting/image_encoding.cc

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

1010
#include "flutter/common/task_runners.h"
11-
#include "flutter/glue/trace_event.h"
11+
#include "flutter/fml/trace_event.h"
1212
#include "flutter/lib/ui/painting/image.h"
1313
#include "flutter/lib/ui/ui_dart_state.h"
1414
#include "lib/fxl/build_config.h"

‎runtime/BUILD.gn

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ source_set("runtime") {
9090
"$flutter_root/common",
9191
"$flutter_root/flow",
9292
"$flutter_root/fml",
93-
"$flutter_root/glue",
9493
"$flutter_root/lib/io",
9594
"$flutter_root/lib/ui",
9695
"$flutter_root/third_party/txt",
@@ -105,8 +104,7 @@ source_set("runtime") {
105104
public_configs = [ "$flutter_root:config" ]
106105

107106
if (flutter_runtime_mode != "release" &&
108-
flutter_runtime_mode != "dynamic_release" &&
109-
!is_fuchsia) {
107+
flutter_runtime_mode != "dynamic_release" && !is_fuchsia) {
110108
# Only link in Observatory in non-release modes on non-Fuchsia. Fuchsia
111109
# instead puts Observatory into the runner's package.
112110
deps += [ "//third_party/dart/runtime/observatory:embedded_observatory_archive" ]

‎runtime/runtime_controller.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "flutter/runtime/runtime_controller.h"
66

77
#include "flutter/fml/message_loop.h"
8-
#include "flutter/glue/trace_event.h"
8+
#include "flutter/fml/trace_event.h"
99
#include "flutter/lib/ui/compositing/scene.h"
1010
#include "flutter/lib/ui/ui_dart_state.h"
1111
#include "flutter/lib/ui/window/window.h"

‎shell/common/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ source_set("common") {
9696
"$flutter_root/common",
9797
"$flutter_root/flow",
9898
"$flutter_root/fml",
99-
"$flutter_root/glue",
10099
"$flutter_root/lib/ui",
101100
"$flutter_root/runtime",
102101
"$flutter_root/synchronization",

‎shell/common/animator.cc

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

55
#include "flutter/shell/common/animator.h"
66

7-
#include "flutter/glue/trace_event.h"
7+
#include "flutter/fml/trace_event.h"
88
#include "lib/fxl/time/stopwatch.h"
99
#include "third_party/dart/runtime/include/dart_tools_api.h"
1010

‎shell/common/engine.cc

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

1010
#include "flutter/common/settings.h"
11-
#include "flutter/glue/trace_event.h"
11+
#include "flutter/fml/trace_event.h"
1212
#include "flutter/lib/snapshot/snapshot.h"
1313
#include "flutter/lib/ui/text/font_collection.h"
1414
#include "flutter/shell/common/animator.h"

‎shell/common/shell.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "flutter/fml/log_settings.h"
1717
#include "flutter/fml/logging.h"
1818
#include "flutter/fml/message_loop.h"
19-
#include "flutter/glue/trace_event.h"
19+
#include "flutter/fml/trace_event.h"
2020
#include "flutter/runtime/dart_vm.h"
2121
#include "flutter/runtime/start_up.h"
2222
#include "flutter/shell/common/engine.h"

‎shell/gpu/gpu.gni

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ template("shell_gpu_configuration") {
4646
"$flutter_root/common",
4747
"$flutter_root/flow",
4848
"$flutter_root/fml",
49-
"$flutter_root/glue",
5049
"$flutter_root/shell/common",
5150
"$flutter_root/synchronization",
5251
"//garnet/public/lib/fxl",

‎shell/gpu/gpu_surface_gl.cc

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

55
#include "gpu_surface_gl.h"
66

7-
#include "flutter/glue/trace_event.h"
7+
#include "flutter/fml/trace_event.h"
88
#include "lib/fxl/arraysize.h"
99
#include "lib/fxl/logging.h"
1010
#include "third_party/skia/include/core/SkColorFilter.h"

‎shell/platform/darwin/ios/BUILD.gn

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ shared_library("create_flutter_framework_dylib") {
9999
"$flutter_root/common",
100100
"$flutter_root/flow",
101101
"$flutter_root/fml",
102-
"$flutter_root/glue",
103102
"$flutter_root/lib/ui",
104103
"$flutter_root/runtime",
105104
"$flutter_root/shell/common",

‎shell/platform/darwin/ios/framework/Source/vsync_waiter_ios.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <mach/mach_time.h>
1212

1313
#include "flutter/common/task_runners.h"
14-
#include "flutter/glue/trace_event.h"
14+
#include "flutter/fml/trace_event.h"
1515
#include "lib/fxl/logging.h"
1616

1717
@interface VSyncClient : NSObject

‎synchronization/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ source_set("synchronization") {
1313
public_configs = [ "$flutter_root:config" ]
1414

1515
public_deps = [
16-
"$flutter_root/glue",
16+
"$flutter_root/fml",
1717
"//garnet/public/lib/fxl",
1818
]
1919
}

‎synchronization/pipeline.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef SYNCHRONIZATION_PIPELINE_H_
66
#define SYNCHRONIZATION_PIPELINE_H_
77

8-
#include "flutter/glue/trace_event.h"
8+
#include "flutter/fml/trace_event.h"
99
#include "flutter/synchronization/pipeline.h"
1010
#include "flutter/synchronization/semaphore.h"
1111
#include "lib/fxl/functional/closure.h"

‎travis/licenses_golden/licenses_flutter

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,10 +332,6 @@ FILE: ../../../flutter/flow/raster_cache.cc
332332
FILE: ../../../flutter/flow/raster_cache.h
333333
FILE: ../../../flutter/flow/scene_update_context.cc
334334
FILE: ../../../flutter/flow/scene_update_context.h
335-
FILE: ../../../flutter/glue/stack_trace.h
336-
FILE: ../../../flutter/glue/stack_trace_base.cc
337-
FILE: ../../../flutter/glue/stack_trace_fuchsia.cc
338-
FILE: ../../../flutter/glue/trace_event.h
339335
FILE: ../../../flutter/lib/ui/painting/image_filter.cc
340336
FILE: ../../../flutter/lib/ui/painting/image_filter.h
341337
FILE: ../../../flutter/lib/ui/semantics.dart

0 commit comments

Comments
 (0)