[web] Remove dependency on 'profiling' subfolder of canvaskit. (flutt…

…er#38169)
ricardoamador · Jan 25, 2023 · 3d437eb · 3d437eb
1 parent 888ad3c
commit 3d437eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/lib/web_ui/dev/steps/compile_tests_step.dart b/lib/web_ui/dev/steps/compile_tests_step.dart
@@ -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(

diff --git a/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart b/lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
@@ -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.
@@ -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) =>

diff --git a/lib/web_ui/lib/src/engine/configuration.dart b/lib/web_ui/lib/src/engine/configuration.dart
@@ -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.