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

Commit 847a58f

Browse files
authored
Revert "Use a single OffscreenCanvas for rendering in CanvasKit (#42672)"
This reverts commit c5ba843.
1 parent 1df0a23 commit 847a58f

21 files changed

+856
-820
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,11 +1970,10 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.da
19701970
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/platform_message.dart + ../../../flutter/LICENSE
19711971
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart + ../../../flutter/LICENSE
19721972
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart + ../../../flutter/LICENSE
1973-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas.dart + ../../../flutter/LICENSE
1974-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas_factory.dart + ../../../flutter/LICENSE
19751973
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart + ../../../flutter/LICENSE
19761974
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart + ../../../flutter/LICENSE
19771975
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart + ../../../flutter/LICENSE
1976+
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart + ../../../flutter/LICENSE
19781977
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart + ../../../flutter/LICENSE
19791978
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text_fragmenter.dart + ../../../flutter/LICENSE
19801979
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart + ../../../flutter/LICENSE
@@ -4720,11 +4719,10 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart
47204719
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/platform_message.dart
47214720
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart
47224721
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
4723-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas.dart
4724-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas_factory.dart
47254722
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
47264723
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart
47274724
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart
4725+
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart
47284726
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart
47294727
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text_fragmenter.dart
47304728
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart

lib/web_ui/lib/src/engine.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,10 @@ export 'engine/canvaskit/picture.dart';
4343
export 'engine/canvaskit/picture_recorder.dart';
4444
export 'engine/canvaskit/raster_cache.dart';
4545
export 'engine/canvaskit/rasterizer.dart';
46-
export 'engine/canvaskit/render_canvas.dart';
47-
export 'engine/canvaskit/render_canvas_factory.dart';
4846
export 'engine/canvaskit/renderer.dart';
4947
export 'engine/canvaskit/shader.dart';
5048
export 'engine/canvaskit/surface.dart';
49+
export 'engine/canvaskit/surface_factory.dart';
5150
export 'engine/canvaskit/text.dart';
5251
export 'engine/canvaskit/text_fragmenter.dart';
5352
export 'engine/canvaskit/util.dart';

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,6 @@ extension CanvasKitExtension on CanvasKit {
161161
DomCanvasElement canvas, SkWebGLContextOptions options) =>
162162
_GetWebGLContext(canvas, options).toDartDouble;
163163

164-
@JS('GetWebGLContext')
165-
external JSNumber _GetOffscreenWebGLContext(
166-
DomOffscreenCanvas canvas, SkWebGLContextOptions options);
167-
double GetOffscreenWebGLContext(
168-
DomOffscreenCanvas canvas, SkWebGLContextOptions options) =>
169-
_GetOffscreenWebGLContext(canvas, options).toDartDouble;
170-
171164
@JS('MakeGrContext')
172165
external SkGrContext _MakeGrContext(JSNumber glContext);
173166
SkGrContext MakeGrContext(double glContext) =>
@@ -206,9 +199,6 @@ extension CanvasKitExtension on CanvasKit {
206199

207200
external SkSurface MakeSWCanvasSurface(DomCanvasElement canvas);
208201

209-
@JS('MakeSWCanvasSurface')
210-
external SkSurface MakeOffscreenSWCanvasSurface(DomOffscreenCanvas canvas);
211-
212202
/// Creates an image from decoded pixels represented as a list of bytes.
213203
///
214204
/// The pixel data must be encoded according to the image info in [info].

0 commit comments

Comments
 (0)