Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reland "Use a single OffscreenCanvas for rendering in CanvasKit (#45744)" #47241

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix bad merge
  • Loading branch information
harryterkelsen committed Oct 24, 2023
commit facee980508fea776a92efca2c3276b87145d52a
46 changes: 19 additions & 27 deletions lib/web_ui/lib/src/engine/dom.dart
Original file line number Diff line number Diff line change
Expand Up @@ -199,34 199,26 @@ external DomIntl get domIntl;
external DomSymbol get domSymbol;

@JS('createImageBitmap')
external JSPromise _createImageBitmap(JSAny source);
Future<DomImageBitmap?> createImageBitmap(JSAny source) =>
js_util.promiseToFuture<DomImageBitmap?>(_createImageBitmap(source));

@JS('createImageBitmap')
external JSPromise _createSizedImageBitmap(DomCanvasElement canvas, JSNumber sx,
JSNumber sy, JSNumber sw, JSNumber sh);
Future<DomImageBitmap?> createSizedImageBitmap(
DomCanvasElement canvas, int sx, int sy, int sw, int sh) =>
js_util.promiseToFuture<DomImageBitmap?>(
_createSizedImageBitmap(canvas, sx.toJS, sy.toJS, sw.toJS, sh.toJS));

@JS('createImageBitmap')
external JSPromise _createSizedImageBitmapFromImageData(
DomImageData imageData, JSNumber sx, JSNumber sy, JSNumber sw, JSNumber sh);
Future<DomImageBitmap?> createSizedImageBitmapFromImageData(
DomImageData imageData, int sx, int sy, int sw, int sh) =>
js_util.promiseToFuture<DomImageBitmap?>(
_createSizedImageBitmapFromImageData(
imageData, sx.toJS, sy.toJS, sw.toJS, sh.toJS));

external JSPromise _createImageBitmap1(
JSAny source,
);
@JS('createImageBitmap')
external JSPromise _createSizedOffscreenImageBitmap(DomOffscreenCanvas canvas,
JSNumber sx, JSNumber sy, JSNumber sw, JSNumber sh);
Future<DomImageBitmap?> createSizedOffscreenImageBitmap(
DomOffscreenCanvas canvas, int sx, int sy, int sw, int sh) =>
js_util.promiseToFuture<DomImageBitmap?>(_createSizedOffscreenImageBitmap(
canvas, sx.toJS, sy.toJS, sw.toJS, sh.toJS));
external JSPromise _createImageBitmap2(
JSAny source,
JSNumber x,
JSNumber y,
JSNumber width,
JSNumber height,
);
JSPromise createImageBitmap(JSAny source,
[({int x, int y, int width, int height})? bounds]) {
if (bounds != null) {
return _createImageBitmap2(source, bounds.x.toJS, bounds.y.toJS,
bounds.width.toJS, bounds.height.toJS);
} else {
return _createImageBitmap1(source);
}
}

@JS()
@staticInterop
Expand Down
1 change: 1 addition & 0 deletions lib/web_ui/test/engine/scene_view_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 3,7 @@
// found in the LICENSE file.

import 'dart:async';
import 'dart:js_interop';

import 'package:test/bootstrap/browser.dart';
import 'package:test/test.dart';
Expand Down