Skip to content

Commit a1befb4

Browse files
chinmaygardechinmaygarde
authored
Revert "Support multiple shells in a single process. (#4932)" (flutter/engine#4964)
This reverts commit 077d295.
1 parent 077d295 commit a1befb4

296 files changed

Lines changed: 8802 additions & 10083 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ allowed_hosts = [
115115
]
116116

117117
deps = {
118-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '3cf97e01cdbd4bb920fa3d40282a56c4b2d62a58',
118+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '8dddd90bf943a8174913564353b30a3b11ee0f7a',
119119

120120
# Fuchsia compatibility
121121
#

‎engine/src/flutter/BUILD.gn‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ group("flutter") {
1010
public_deps = [
1111
"$flutter_root/lib/snapshot:generate_snapshot_bin",
1212
"$flutter_root/lib/snapshot:kernel_platform_files",
13-
"$flutter_root/shell/testing",
1413
"$flutter_root/sky",
14+
"$flutter_root/third_party/txt",
1515
]
1616

1717
if (flutter_runtime_mode != "debug") {
18-
public_deps += [ "$flutter_root/lib/snapshot:entry_points_json_files" ]
18+
public_deps += [
19+
"$flutter_root/lib/snapshot:entry_points_json_files",
20+
]
1921
}
2022

2123
if (!is_fuchsia && !is_fuchsia_host) {
@@ -43,24 +45,20 @@ group("flutter") {
4345
"$flutter_root/shell/platform/embedder:flutter_embedder_framework",
4446
]
4547
}
46-
48+
if (!is_win) {
49+
public_deps += [
50+
"$flutter_root/shell/platform/embedder:embedder_unittests",
51+
"$flutter_root/shell/platform/embedder:flutter_engine",
52+
]
53+
}
4754
public_deps += [
4855
"$flutter_root/flow:flow_unittests",
4956
"$flutter_root/fml:fml_unittests",
50-
"$flutter_root/runtime:runtime_unittests",
51-
"$flutter_root/shell/common:shell_unittests",
5257
"$flutter_root/sky/engine/wtf:wtf_unittests",
5358
"$flutter_root/synchronization:synchronization_unittests",
5459
"$flutter_root/third_party/txt:txt_unittests",
5560
"//garnet/public/lib/fxl:fxl_unittests",
5661
]
57-
58-
if (!is_win) {
59-
public_deps += [
60-
"$flutter_root/shell/platform/embedder:embedder_unittests",
61-
"$flutter_root/shell/platform/embedder:flutter_engine",
62-
]
63-
}
6462
}
6563
}
6664

@@ -76,47 +74,59 @@ if (is_fuchsia) {
7674
"$flutter_root/content_handler:aot",
7775
]
7876
if (flutter_runtime_mode != "release") {
79-
deps += [ "//third_party/dart/runtime/observatory:embedded_archive_observatory" ]
77+
deps += [
78+
"//third_party/dart/runtime/observatory:embedded_archive_observatory",
79+
]
8080
}
8181

8282
binary = "flutter_aot_runner"
8383

8484
if (flutter_runtime_mode != "release") {
85-
resources = [ {
86-
path = rebase_path(
87-
"$root_gen_dir/observatory/embedded_archive_observatory.tar")
88-
dest = "observatory.tar"
89-
} ]
85+
resources = [
86+
{
87+
path = rebase_path(
88+
"$root_gen_dir/observatory/embedded_archive_observatory.tar")
89+
dest = "observatory.tar"
90+
},
91+
]
9092
}
9193

92-
meta = [ {
93-
path = rebase_path("content_handler/meta/sandbox")
94-
dest = "sandbox"
95-
} ]
94+
meta = [
95+
{
96+
path = rebase_path("content_handler/meta/sandbox")
97+
dest = "sandbox"
98+
},
99+
]
96100
}
97101

98102
package("flutter_jit_runner") {
99103
deps = [
100104
"$flutter_root/content_handler:jit",
101105
]
102106
if (flutter_runtime_mode != "release") {
103-
deps += [ "//third_party/dart/runtime/observatory:embedded_archive_observatory" ]
107+
deps += [
108+
"//third_party/dart/runtime/observatory:embedded_archive_observatory",
109+
]
104110
}
105111

106112
binary = "flutter_jit_runner"
107113

108114
if (flutter_runtime_mode != "release") {
109-
resources = [ {
110-
path = rebase_path(
111-
"$root_gen_dir/observatory/embedded_archive_observatory.tar")
112-
dest = "observatory.tar"
113-
} ]
115+
resources = [
116+
{
117+
path = rebase_path(
118+
"$root_gen_dir/observatory/embedded_archive_observatory.tar")
119+
dest = "observatory.tar"
120+
},
121+
]
114122
}
115123

116-
meta = [ {
117-
path = rebase_path("content_handler/meta/sandbox")
118-
dest = "sandbox"
119-
} ]
124+
meta = [
125+
{
126+
path = rebase_path("content_handler/meta/sandbox")
127+
dest = "sandbox"
128+
},
129+
]
120130
}
121131
} else {
122132
group("dist") {

‎engine/src/flutter/assets/BUILD.gn‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44

55
source_set("assets") {
66
sources = [
7-
"asset_manager.cc",
8-
"asset_manager.h",
9-
"asset_resolver.h",
7+
"asset_provider.h",
108
"directory_asset_bundle.cc",
119
"directory_asset_bundle.h",
10+
"unzipper_provider.cc",
11+
"unzipper_provider.h",
1212
"zip_asset_store.cc",
1313
"zip_asset_store.h",
1414
]
1515

1616
deps = [
17-
"$flutter_root/common",
18-
"$flutter_root/fml",
1917
"$flutter_root/glue",
2018
"//garnet/public/lib/fxl",
2119
"//garnet/public/lib/zip",
@@ -25,5 +23,7 @@ source_set("assets") {
2523
"//third_party/zlib:minizip",
2624
]
2725

28-
public_configs = [ "$flutter_root:config" ]
26+
public_configs = [
27+
"$flutter_root:config",
28+
]
2929
}

‎engine/src/flutter/assets/asset_manager.cc‎

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

‎engine/src/flutter/assets/asset_manager.h‎

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

‎engine/src/flutter/assets/asset_provider.h‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2018 The Chromium Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
#ifndef FLUTTER_ASSETS_ASSET_PROVIDER_H_
6+
#define FLUTTER_ASSETS_ASSET_PROVIDER_H_
7+
8+
#include <string>
9+
#include <vector>
10+
11+
#include "lib/fxl/memory/ref_counted.h"
12+
13+
namespace blink {
14+
15+
class AssetProvider
16+
: public fxl::RefCountedThreadSafe<AssetProvider>
17+
{
18+
public:
19+
virtual bool GetAsBuffer(const std::string& asset_name,
20+
std::vector<uint8_t>* data) = 0;
21+
virtual ~AssetProvider() = default;
22+
};
23+
24+
} // namespace blink
25+
#endif // FLUTTER_ASSETS_ASSET_PROVIDER_H

‎engine/src/flutter/assets/asset_resolver.h‎

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

0 commit comments

Comments
 (0)