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

[web][refactor] Split html and canvaskit classes more #14320

Merged
yjbanov merged 3 commits into from
Dec 12, 2019
Merged

[web][refactor] Split html and canvaskit classes more #14320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97aeb1e
Split surface and canvaskit classes more
yjbanov Dec 11, 2019
13ca172
fix licenses
yjbanov Dec 11, 2019
fa0f868
address comments
yjbanov Dec 11, 2019
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
5 changes: 4 additions & 1 deletion ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/layer.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/layer_scene_builder.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/layer_tree.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/n_way_canvas.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/painting.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/path.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/path_metrics.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/compositor/picture.dart
Expand Down Expand Up @@ -426,7 +427,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_views.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/plugins.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_converter.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/recording_canvas.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/render_vertices.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/rrect_renderer.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/semantics/accessibility.dart
Expand All @@ -451,8 +451,11 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/clip.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/debug_canvas_reuse_overlay.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/offset.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/opacity.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/painting.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/path_metrics.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/picture.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/platform_view.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/recording_canvas.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/scene.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/scene_builder.dart
FILE: ../../../flutter/lib/web_ui/lib/src/engine/surface/surface.dart
Expand Down
5 changes: 4 additions & 1 deletion lib/web_ui/lib/src/engine.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ part 'engine/compositor/layer_scene_builder.dart';
part 'engine/compositor/layer_tree.dart';
part 'engine/compositor/n_way_canvas.dart';
part 'engine/compositor/path.dart';
part 'engine/compositor/painting.dart';
part 'engine/compositor/path_metrics.dart';
part 'engine/compositor/picture.dart';
part 'engine/compositor/picture_recorder.dart';
Expand Down Expand Up @@ -65,7 +66,6 @@ part 'engine/platform_views.dart';
part 'engine/plugins.dart';
part 'engine/pointer_binding.dart';
part 'engine/pointer_converter.dart';
part 'engine/recording_canvas.dart';
part 'engine/render_vertices.dart';
part 'engine/rrect_renderer.dart';
part 'engine/semantics/accessibility.dart';
Expand All @@ -90,8 +90,11 @@ part 'engine/surface/clip.dart';
part 'engine/surface/debug_canvas_reuse_overlay.dart';
part 'engine/surface/offset.dart';
part 'engine/surface/opacity.dart';
part 'engine/surface/painting.dart';
part 'engine/surface/path_metrics.dart';
part 'engine/surface/picture.dart';
part 'engine/surface/platform_view.dart';
part 'engine/surface/recording_canvas.dart';
part 'engine/surface/scene.dart';
part 'engine/surface/scene_builder.dart';
part 'engine/surface/surface.dart';
Expand Down
42 changes: 21 additions & 21 deletions lib/web_ui/lib/src/engine/bitmap_canvas.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
html.CanvasRenderingContext2D get ctx => _ctx;

/// Sets the global paint styles to correspond to [paint].
void _applyPaint(ui.PaintData paint) {
void _applyPaint(SurfacePaintData paint) {
ctx.globalCompositeOperation =
_stringForBlendMode(paint.blendMode) ?? 'source-over';
ctx.lineWidth = paint.strokeWidth ?? 1.0;
Expand Down Expand Up @@ -273,7 +273,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
}
}

void _strokeOrFill(ui.PaintData paint, {bool resetPaint = true}) {
void _strokeOrFill(SurfacePaintData paint, {bool resetPaint = true}) {
switch (paint.style) {
case ui.PaintingStyle.stroke:
ctx.stroke();
Expand Down Expand Up @@ -448,7 +448,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
}

@override
void drawLine(ui.Offset p1, ui.Offset p2, ui.PaintData paint) {
void drawLine(ui.Offset p1, ui.Offset p2, SurfacePaintData paint) {
_applyPaint(paint);
ctx.beginPath();
ctx.moveTo(p1.dx, p1.dy);
Expand All @@ -458,7 +458,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
}

@override
void drawPaint(ui.PaintData paint) {
void drawPaint(SurfacePaintData paint) {
_applyPaint(paint);
ctx.beginPath();

Expand All @@ -471,22 +471,22 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
}

@override
void drawRect(ui.Rect rect, ui.PaintData paint) {
void drawRect(ui.Rect rect, SurfacePaintData paint) {
_applyPaint(paint);
ctx.beginPath();
ctx.rect(rect.left, rect.top, rect.width, rect.height);
_strokeOrFill(paint);
}

@override
void drawRRect(ui.RRect rrect, ui.PaintData paint) {
void drawRRect(ui.RRect rrect, SurfacePaintData paint) {
_applyPaint(paint);
_RRectToCanvasRenderer(ctx).render(rrect);
_strokeOrFill(paint);
}

@override
void drawDRRect(ui.RRect outer, ui.RRect inner, ui.PaintData paint) {
void drawDRRect(ui.RRect outer, ui.RRect inner, SurfacePaintData paint) {
_applyPaint(paint);
_RRectRenderer renderer = _RRectToCanvasRenderer(ctx);
renderer.render(outer);
Expand All @@ -495,7 +495,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
}

@override
void drawOval(ui.Rect rect, ui.PaintData paint) {
void drawOval(ui.Rect rect, SurfacePaintData paint) {
_applyPaint(paint);
ctx.beginPath();
ctx.ellipse(rect.center.dx, rect.center.dy, rect.width / 2, rect.height / 2,
Expand All @@ -504,15 +504,15 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
}

@override
void drawCircle(ui.Offset c, double radius, ui.PaintData paint) {
void drawCircle(ui.Offset c, double radius, SurfacePaintData paint) {
_applyPaint(paint);
ctx.beginPath();
ctx.ellipse(c.dx, c.dy, radius, radius, 0, 0, 2.0 * math.pi, false);
_strokeOrFill(paint);
}

@override
void drawPath(ui.Path path, ui.PaintData paint) {
void drawPath(ui.Path path, SurfacePaintData paint) {
_applyPaint(paint);
_runPath(path);
_strokeOrFill(paint);
Expand All @@ -534,14 +534,14 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
// paint the shadow without the path itself, but if we use a non-zero
// alpha for the paint the path is painted in addition to the shadow,
// which is undesirable.
final ui.Paint paint = ui.Paint()
final SurfacePaint paint = SurfacePaint()
..color = shadow.color
..style = ui.PaintingStyle.fill
..strokeWidth = 0.0
..maskFilter = ui.MaskFilter.blur(ui.BlurStyle.normal, shadow.blur);
_ctx.save();
_ctx.translate(shadow.offsetX, shadow.offsetY);
final ui.PaintData paintData = paint.webOnlyPaintData;
final SurfacePaintData paintData = paint.paintData;
_applyPaint(paintData);
_runPath(path);
_strokeOrFill(paintData, resetPaint: false);
Expand All @@ -555,12 +555,12 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
// the opaque occluder. For that reason, we fill with the shadow color,
// and set the shadow color to fully opaque. This way, the visible
// pixels are less opaque and less noticeable.
final ui.Paint paint = ui.Paint()
final SurfacePaint paint = SurfacePaint()
..color = shadow.color
..style = ui.PaintingStyle.fill
..strokeWidth = 0.0;
_ctx.save();
final ui.PaintData paintData = paint.webOnlyPaintData;
final SurfacePaintData paintData = paint.paintData;
_applyPaint(paintData);
_ctx.shadowBlur = shadow.blur;
_ctx.shadowColor = shadow.color.withAlpha(0xff).toCssString();
Expand All @@ -576,7 +576,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
}

@override
void drawImage(ui.Image image, ui.Offset p, ui.PaintData paint) {
void drawImage(ui.Image image, ui.Offset p, SurfacePaintData paint) {
_applyPaint(paint);
final HtmlImage htmlImage = image;
final html.ImageElement imgElement = htmlImage.cloneImageElement();
Expand Down Expand Up @@ -607,7 +607,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {

@override
void drawImageRect(
ui.Image image, ui.Rect src, ui.Rect dst, ui.PaintData paint) {
ui.Image image, ui.Rect src, ui.Rect dst, SurfacePaintData paint) {
final HtmlImage htmlImage = image;
final bool requiresClipping = src.left != 0 ||
src.top != 0 ||
Expand Down Expand Up @@ -698,8 +698,8 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
if (paragraph._drawOnCanvas && _childOverdraw == false) {
final List<EngineLineMetrics> lines = paragraph._measurementResult.lines;

final ui.PaintData backgroundPaint =
paragraph._background?.webOnlyPaintData;
final SurfacePaintData backgroundPaint =
paragraph._background?.paintData;
if (backgroundPaint != null) {
final ui.Rect rect = ui.Rect.fromLTWH(
offset.dx, offset.dy, paragraph.width, paragraph.height);
Expand All @@ -710,7 +710,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
ctx.font = style.cssFontString;
_cachedLastStyle = style;
}
_applyPaint(paragraph._paint.webOnlyPaintData);
_applyPaint(paragraph._paint.paintData);

final double x = offset.dx + paragraph._alignOffset;
double y = offset.dy + paragraph.alphabeticBaseline;
Expand Down Expand Up @@ -764,7 +764,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
/// and use a SkTriColorShader to render.
@override
void drawVertices(
ui.Vertices vertices, ui.BlendMode blendMode, ui.PaintData paint) {
ui.Vertices vertices, ui.BlendMode blendMode, SurfacePaintData paint) {
// TODO(flutter_web): Implement shaders for [Paint.shader] and
// blendMode. https://github.com/flutter/flutter/issues/40096
// Move rendering to OffscreenCanvas so that transform is preserved
Expand All @@ -790,7 +790,7 @@ class BitmapCanvas extends EngineCanvas with SaveStackTracking {
}

/// 'Runs' the given [path] by applying all of its commands to the canvas.
void _runPath(ui.Path path) {
void _runPath(SurfacePath path) {
ctx.beginPath();
for (Subpath subpath in path.subpaths) {
for (PathCommand command in subpath.commands) {
Expand Down
Loading