DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[flutter_tools] remove k toggle for canvaskit from web runner (#66273)

Browse Source 
The k toggle allows switching between canvaskit and html backend at runtime. unfortunately this causes hot restart to break, since the dart_sdk modules stores state at runtime. The recommendation will be to use cavaskit via dart-defines.
This commit is contained in:
Jonah Williams 2020-09-21 15:33:32 -07:00 committed by GitHub
parent 4c7f746374
commit 511367aa5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/flutter_tools/lib/src/build_runner/resident_web_runner.dart
View File

@ -799,9 +799,6 @@ class _ResidentWebRunner extends ResidentWebRunner {
return 0;
}
@override
bool get supportsCanvasKit => supportsServiceProtocol;
@override
Future<bool> toggleCanvaskit() async {
final WebDevFS webDevFS = device.devFS as WebDevFS;

11
packages/flutter_tools/lib/src/resident_runner.dart
View File

@ -795,7 +795,6 @@ abstract class ResidentRunner {
bool get isRunningProfile => debuggingOptions.buildInfo.isProfile;
bool get isRunningRelease => debuggingOptions.buildInfo.isRelease;
bool get supportsServiceProtocol => isRunningDebug || isRunningProfile;
bool get supportsCanvasKit => false;
bool get supportsWriteSkSL => supportsServiceProtocol;
bool get trackWidgetCreation => debuggingOptions.buildInfo.trackWidgetCreation;
@ -1319,9 +1318,6 @@ abstract class ResidentRunner {
commandHelp.S.print();
commandHelp.U.print();
}
if (supportsCanvasKit){
commandHelp.k.print();
}
if (supportsWriteSkSL) {
commandHelp.M.print();
}
@ -1476,13 +1472,6 @@ class TerminalHandler {
return true;
}
return false;
case 'k':
if (residentRunner.supportsCanvasKit) {
final bool result = await residentRunner.toggleCanvaskit();
globals.printStatus('${result ? 'Enabled' : 'Disabled'} CanvasKit');
return true;
}
return false;
case 'L':
if (residentRunner.supportsServiceProtocol) {
await residentRunner.debugDumpLayerTree();

4
packages/flutter_tools/test/general.shard/resident_runner_test.dart
View File

@ -1223,8 +1223,6 @@ void main() {
expect(residentRunner.supportsServiceProtocol, true);
// isRunningDebug
expect(residentRunner.isRunningDebug, true);
// does not support CanvasKit
expect(residentRunner.supportsCanvasKit, false);
// does support SkSL
expect(residentRunner.supportsWriteSkSL, true);
// commands
@ -1278,8 +1276,6 @@ void main() {
expect(residentRunner.supportsServiceProtocol, false);
// isRunningDebug
expect(residentRunner.isRunningDebug, false);
// does not support CanvasKit
expect(residentRunner.supportsCanvasKit, false);
// does support SkSL
expect(residentRunner.supportsWriteSkSL, false);
// commands

1
packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
View File

@ -759,7 +759,6 @@ void main() {
final WebAssetServer webAssetServer = WebAssetServer(null, null, null, null, null, null);
when(mockWebDevFS.webAssetServer).thenReturn(webAssetServer);
expect(residentWebRunner.supportsCanvasKit, true);
expect(webAssetServer.canvasKitRendering, false);
final bool toggleResult = await residentWebRunner.toggleCanvaskit();

12
packages/flutter_tools/test/general.shard/terminal_handler_test.dart
View File

@ -109,18 +109,6 @@ void main() {
verify(mockResidentRunner.printHelp(details: true)).called(3);
});
testUsingContext('k - toggles CanvasKit rendering and prints results', () async {
when(mockResidentRunner.supportsCanvasKit).thenReturn(true);
when(mockResidentRunner.toggleCanvaskit())
.thenAnswer((Invocation invocation) async {
return true;
});
await terminalHandler.processTerminalInput('k');
verify(mockResidentRunner.toggleCanvaskit()).called(1);
});
testUsingContext('i - debugToggleWidgetInspector with service protocol', () async {
await terminalHandler.processTerminalInput('i');