Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit acb5610

Browse files
author
Harry Terkelsen
authored
[web] Remove dependency on 'profiling' subfolder of canvaskit. (#38169)
1 parent 2499a5d commit acb5610

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

lib/web_ui/dev/steps/compile_tests_step.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,8 @@ Future<void> copyCanvasKitFiles({bool useLocalCanvasKit = false}) async {
173173
targetDir.path,
174174
pathlib.basename(file.path),
175175
));
176-
final io.File profileTargetFile = io.File(pathlib.join(
177-
targetDir.path,
178-
'profiling',
179-
pathlib.basename(file.path),
180-
));
181176
await normalTargetFile.create(recursive: true);
182-
await profileTargetFile.create(recursive: true);
183177
await file.copy(normalTargetFile.path);
184-
await file.copy(profileTargetFile.path);
185178
}
186179
} else {
187180
final io.Directory canvasKitDir = io.Directory(pathlib.join(

lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import 'package:ui/ui.dart' as ui;
1919

2020
import '../configuration.dart';
2121
import '../dom.dart';
22-
import '../initialization.dart';
2322
import '../profiler.dart';
2423

2524
/// Entrypoint into the CanvasKit API.
@@ -2662,8 +2661,7 @@ void patchCanvasKitModule(DomHTMLScriptElement canvasKitScript) {
26622661
domDocument.head!.appendChild(canvasKitScript);
26632662
}
26642663

2665-
String get canvasKitBuildUrl =>
2666-
configuration.canvasKitBaseUrl + (kProfileMode ? 'profiling/' : '');
2664+
String get canvasKitBuildUrl => configuration.canvasKitBaseUrl;
26672665
String get canvasKitJavaScriptBindingsUrl =>
26682666
'${canvasKitBuildUrl}canvaskit.js';
26692667
String canvasKitWasmModuleUrl(String canvasKitBase, String file) =>

lib/web_ui/lib/src/engine/configuration.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,8 @@ class FlutterConfiguration {
160160
///
161161
/// The expected directory structure nested under this URL is as follows:
162162
///
163-
/// /canvaskit.js - the release build of CanvasKit JS API bindings
164-
/// /canvaskit.wasm - the release build of CanvasKit WASM module
165-
/// /profiling/canvaskit.js - the profile build of CanvasKit JS API bindings
166-
/// /profiling/canvaskit.wasm - the profile build of CanvasKit WASM module
163+
/// /canvaskit.js - the build of CanvasKit JS API bindings
164+
/// /canvaskit.wasm - the build of CanvasKit WASM module
167165
///
168166
/// The base URL can be overridden using the `FLUTTER_WEB_CANVASKIT_URL`
169167
/// environment variable or using the configuration API for JavaScript.

0 commit comments

Comments
 (0)