Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
73861e2
WIP
harryterkelsen Jun 5, 2023
4a5fddb
Merge branch 'main' into canvaskit-single-context
harryterkelsen Jun 5, 2023
1b8cf82
WIP
harryterkelsen Jun 6, 2023
345097d
Merge branch 'main' into canvaskit-single-context
harryterkelsen Jun 6, 2023
6653c6d
Merge branch 'main' into canvaskit-single-context
harryterkelsen Jun 6, 2023
513e0ed
WIP
harryterkelsen Jun 7, 2023
a5ae61e
Merge branch 'main' into canvaskit-single-context
harryterkelsen Jun 7, 2023
961db55
WIP
harryterkelsen Jun 8, 2023
015bab2
Merge branch 'main' into canvaskit-single-context
harryterkelsen Jun 8, 2023
a9ada47
update tests
harryterkelsen Jun 8, 2023
f7560ec
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Jun 12, 2023
4e332d6
Update goldens
harryterkelsen Jun 12, 2023
911871e
Fix license header
harryterkelsen Jun 12, 2023
32f6d1b
Fix license header
harryterkelsen Jun 13, 2023
84940bc
Address analyzer warnings
harryterkelsen Jun 13, 2023
849005f
Unused import
harryterkelsen Jun 13, 2023
193b583
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Jun 13, 2023
89895f3
error if OffscreenCanvas is unsupported
harryterkelsen Jun 13, 2023
09d4bb7
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Jun 14, 2023
6bc9a3d
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Jun 15, 2023
6428d4c
Print useragent if OffscreenCanvas is not available
harryterkelsen Jun 15, 2023
f0ce392
Fall back to HTML Canvas on Safari
harryterkelsen Jun 15, 2023
2d76c46
Don't test OffscreenCanvas when it's not supported
harryterkelsen Jun 15, 2023
bb5b746
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Jun 15, 2023
37fe7f4
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Jun 20, 2023
bcc2122
Use createImageBitmap to crop the bitmap
harryterkelsen Jun 22, 2023
084732d
Fix test
harryterkelsen Jun 22, 2023
0b14029
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Jun 22, 2023
901bb70
improve doc comment
harryterkelsen Jun 22, 2023
10b84f8
Merge branch 'main' into canvaskit-single-context
harryterkelsen Aug 2, 2023
4c08850
Fix bad merge
harryterkelsen Aug 2, 2023
994b80b
Remove unused import
harryterkelsen Aug 2, 2023
e05360e
Merge branch 'main' into canvaskit-single-context
harryterkelsen Aug 17, 2023
04e42a4
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Aug 29, 2023
d0e4009
Fix merge
harryterkelsen Aug 29, 2023
a09090f
Add back maximum overlays and fix tests
harryterkelsen Aug 29, 2023
876a424
Handle case where platform views don't change
harryterkelsen Aug 30, 2023
5d4ed11
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Aug 30, 2023
b4d8383
Fix bad merge
harryterkelsen Aug 30, 2023
d50ff5e
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Sep 6, 2023
eab0290
Respond to comments
harryterkelsen Sep 6, 2023
cde8739
Update tests
harryterkelsen Sep 6, 2023
9fea067
Fix warning
harryterkelsen Sep 6, 2023
3a90473
Fix analysis warnings
harryterkelsen Sep 6, 2023
c29808b
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Sep 6, 2023
17d7412
Delete empty branch
harryterkelsen Sep 12, 2023
9a11fae
Remove unused variable
harryterkelsen Sep 12, 2023
4011030
Merge branch 'main' into pr/hterkelsen/42672
harryterkelsen Sep 12, 2023
32f1c24
Remove unused import
harryterkelsen Sep 12, 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
6 changes: 4 additions & 2 deletions ci/licenses_golden/licenses_flutter
Original file line number Diff line number Diff line change
Expand Up @@ -1970,10 +1970,11 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.da
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/platform_message.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas_factory.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text_fragmenter.dart + ../../../flutter/LICENSE
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart + ../../../flutter/LICENSE
Expand Down Expand Up @@ -4719,10 +4720,11 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/picture_recorder.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/platform_message.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/raster_cache.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/rasterizer.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/render_canvas_factory.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/renderer.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/shader.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/surface_factory.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/text_fragmenter.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/canvaskit/util.dart
Expand Down
3 changes: 2 additions & 1 deletion lib/web_ui/lib/src/engine.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,11 @@ export 'engine/canvaskit/picture.dart';
export 'engine/canvaskit/picture_recorder.dart';
export 'engine/canvaskit/raster_cache.dart';
export 'engine/canvaskit/rasterizer.dart';
export 'engine/canvaskit/render_canvas.dart';
export 'engine/canvaskit/render_canvas_factory.dart';
export 'engine/canvaskit/renderer.dart';
export 'engine/canvaskit/shader.dart';
export 'engine/canvaskit/surface.dart';
export 'engine/canvaskit/surface_factory.dart';
export 'engine/canvaskit/text.dart';
export 'engine/canvaskit/text_fragmenter.dart';
export 'engine/canvaskit/util.dart';
Expand Down
10 changes: 10 additions & 0 deletions lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,13 @@ extension CanvasKitExtension on CanvasKit {
DomCanvasElement canvas, SkWebGLContextOptions options) =>
_GetWebGLContext(canvas, options).toDartDouble;

@JS('GetWebGLContext')
external JSNumber _GetOffscreenWebGLContext(
DomOffscreenCanvas canvas, SkWebGLContextOptions options);
double GetOffscreenWebGLContext(
DomOffscreenCanvas canvas, SkWebGLContextOptions options) =>
_GetOffscreenWebGLContext(canvas, options).toDartDouble;

@JS('MakeGrContext')
external SkGrContext _MakeGrContext(JSNumber glContext);
SkGrContext MakeGrContext(double glContext) =>
Expand Down Expand Up @@ -199,6 +206,9 @@ extension CanvasKitExtension on CanvasKit {

external SkSurface MakeSWCanvasSurface(DomCanvasElement canvas);

@JS('MakeSWCanvasSurface')
external SkSurface MakeOffscreenSWCanvasSurface(DomOffscreenCanvas canvas);

/// Creates an image from decoded pixels represented as a list of bytes.
///
/// The pixel data must be encoded according to the image info in [info].
Expand Down
Loading