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

[web] Remove dependency on 'profiling' subfolder of canvaskit. #38169

Merged
merged 6 commits into from
Jan 24, 2023
Merged

[web] Remove dependency on 'profiling' subfolder of canvaskit. #38169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9a4e42
[web] Remove dependency on 'profiling' subfolder of canvaskit.
harryterkelsen Dec 9, 2022
36e5d49
Remove more
harryterkelsen Dec 9, 2022
7cf1c50
Remove unused import
harryterkelsen Dec 9, 2022
94fc60c
Merge branch 'main' into remove-canvaskit-profiling-extra
harryterkelsen Jan 24, 2023
f0ea26b
Keep the profiling build in CIPD
harryterkelsen Jan 24, 2023
1dfc9c6
Merge branch 'main' into remove-canvaskit-profiling-extra
harryterkelsen Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions lib/web_ui/dev/steps/compile_tests_step.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,8 @@ Future<void> copyCanvasKitFiles({bool useLocalCanvasKit = false}) async {
targetDir.path,
pathlib.basename(file.path),
));
final io.File profileTargetFile = io.File(pathlib.join(
targetDir.path,
'profiling',
pathlib.basename(file.path),
));
await normalTargetFile.create(recursive: true);
await profileTargetFile.create(recursive: true);
await file.copy(normalTargetFile.path);
await file.copy(profileTargetFile.path);
}
} else {
final io.Directory canvasKitDir = io.Directory(pathlib.join(
Expand Down
4 changes: 1 addition & 3 deletions lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import 'package:ui/ui.dart' as ui;

import '../configuration.dart';
import '../dom.dart';
import '../initialization.dart';
import '../profiler.dart';

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

String get canvasKitBuildUrl =>
configuration.canvasKitBaseUrl + (kProfileMode ? 'profiling/' : '');
String get canvasKitBuildUrl => configuration.canvasKitBaseUrl;
String get canvasKitJavaScriptBindingsUrl =>
'${canvasKitBuildUrl}canvaskit.js';
String canvasKitWasmModuleUrl(String canvasKitBase, String file) =>
Expand Down
6 changes: 2 additions & 4 deletions lib/web_ui/lib/src/engine/configuration.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,8 @@ class FlutterConfiguration {
///
/// The expected directory structure nested under this URL is as follows:
///
/// /canvaskit.js - the release build of CanvasKit JS API bindings
/// /canvaskit.wasm - the release build of CanvasKit WASM module
/// /profiling/canvaskit.js - the profile build of CanvasKit JS API bindings
/// /profiling/canvaskit.wasm - the profile build of CanvasKit WASM module
/// /canvaskit.js - the build of CanvasKit JS API bindings
/// /canvaskit.wasm - the build of CanvasKit WASM module
///
/// The base URL can be overridden using the `FLUTTER_WEB_CANVASKIT_URL`
/// environment variable or using the configuration API for JavaScript.
Expand Down