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

Commit 5c1c07f

Browse files
author
Harry Terkelsen
authored
Revert "Revert "Reland "Default the CanvasKit base URL to local artifacts. (#40293)" (#40470)" (#40700)" (#40717)
This reverts commit db8da7f.
1 parent 3287e2b commit 5c1c07f

File tree

4 files changed

+1
-207
lines changed

4 files changed

+1
-207
lines changed

lib/web_ui/README.md

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -214,34 +214,6 @@ Resources:
214214
2. LUCI web [recipe][5]
215215
3. More general reading on CIPD packages [link][6]
216216

217-
### Rolling CanvasKit
218-
219-
CanvasKit is versioned separately from Skia and rolled manually. Flutter
220-
consumes a pre-built CanvasKit provided by the Skia team, currently hosted on
221-
unpkg.com. When a new version of CanvasKit is available (check
222-
https://www.npmjs.com/package/canvaskit-wasm or consult the Skia team
223-
directly), follow these steps to roll to the new version:
224-
225-
- Make sure you have `depot_tools` installed (if you are regularly hacking on
226-
the engine code, you probably do).
227-
- If not already authenticated with CIPD, run `cipd auth-login` and follow
228-
instructions (this step requires sufficient privileges; file a github
229-
infra ticket queue issue: https://github.com/flutter/flutter/wiki/Infra-Ticket-Queue
230-
to get access)
231-
- Edit `dev/canvaskit_lock.yaml` and update the value of `canvaskit_version`
232-
to the new version.
233-
- Run `dart dev/canvaskit_roller.dart` and make sure it completes successfully.
234-
The script uploads the new version of CanvasKit to the
235-
`flutter/web/canvaskit_bundle` CIPD package, and writes the CIPD package
236-
instance ID to the DEPS file.
237-
- Rerun `gclient sync` and do a clean build to test that the new version is
238-
picked up.
239-
- Send a pull request containing the above file changes. If the new version
240-
contains breaking changes, the PR must also contain corresponding fixes.
241-
242-
If you have questions, contact the Flutter Web team on Flutter Discord on the
243-
#hackers-web-🌍 channel.
244-
245217
### Rolling Noto Font Data
246218

247219
In order to generate new data for the Noto fallback fonts, you will need

lib/web_ui/dev/canvaskit_lock.yaml

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

lib/web_ui/dev/canvaskit_roller.dart

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

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ import 'package:meta/meta.dart';
5050
import 'canvaskit/renderer.dart';
5151
import 'dom.dart';
5252

53-
/// The version of CanvasKit used by the web engine by default.
54-
// DO NOT EDIT THE NEXT LINE OF CODE MANUALLY
55-
// See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
56-
const String _canvaskitVersion = '0.38.0';
57-
5853
/// The Web Engine configuration for the current application.
5954
FlutterConfiguration get configuration =>
6055
_configuration ??= FlutterConfiguration.legacy(_jsConfiguration);
@@ -209,7 +204,7 @@ class FlutterConfiguration {
209204
String get canvasKitBaseUrl => _configuration?.canvasKitBaseUrl ?? _defaultCanvasKitBaseUrl;
210205
static const String _defaultCanvasKitBaseUrl = String.fromEnvironment(
211206
'FLUTTER_WEB_CANVASKIT_URL',
212-
defaultValue: 'https://unpkg.com/canvaskit-wasm@$_canvaskitVersion/bin/',
207+
defaultValue: 'canvaskit/',
213208
);
214209

215210
/// The variant of CanvasKit to download.

0 commit comments

Comments
 (0)