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

Create an ImageHandle wrapper #21057

Merged
merged 18 commits into from
Sep 23, 2020
Merged

Create an ImageHandle wrapper #21057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
aa5caba
Create an ImageHandle wrapper
dnfield Sep 9, 2020
df403f3
review
dnfield Sep 10, 2020
6b700aa
Only handles, no virtual dispatch
dnfield Sep 11, 2020
8537a70
docs
dnfield Sep 11, 2020
b69d226
web stubs
dnfield Sep 11, 2020
0cf431c
Make FrameInfo a regular Dart class, update tests
dnfield Sep 11, 2020
4f15600
more docs
dnfield Sep 11, 2020
9eef907
review
dnfield Sep 11, 2020
17254e3
docs
dnfield Sep 14, 2020
cb29ca9
Merge remote-tracking branch 'upstream/master' into image_wrap
dnfield Sep 16, 2020
fdaeb11
Merge remote-tracking branch 'upstream/master' into image_wrap
dnfield Sep 18, 2020
f00dd18
merge and fix test
dnfield Sep 18, 2020
31d47de
make tests work in AOT
dnfield Sep 18, 2020
6bd80bb
Merge remote-tracking branch 'upstream/master' into image_wrap
dnfield Sep 22, 2020
03324dc
Fix nullability
dnfield Sep 22, 2020
084796f
Make host release unit test work
dnfield Sep 22, 2020
bf4cfeb
Merge remote-tracking branch 'upstream/master' into image_wrap
dnfield Sep 23, 2020
e38a09d
CI
dnfield Sep 23, 2020
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
2 changes: 0 additions & 2 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,6 @@ FILE: ../../../flutter/lib/ui/painting/color_filter.cc
FILE: ../../../flutter/lib/ui/painting/color_filter.h
FILE: ../../../flutter/lib/ui/painting/engine_layer.cc
FILE: ../../../flutter/lib/ui/painting/engine_layer.h
FILE: ../../../flutter/lib/ui/painting/frame_info.cc
FILE: ../../../flutter/lib/ui/painting/frame_info.h
FILE: ../../../flutter/lib/ui/painting/gradient.cc
FILE: ../../../flutter/lib/ui/painting/gradient.h
FILE: ../../../flutter/lib/ui/painting/image.cc
Expand Down
2 changes: 0 additions & 2 deletions lib/ui/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ source_set("ui") {
"painting/color_filter.h",
"painting/engine_layer.cc",
"painting/engine_layer.h",
"painting/frame_info.cc",
"painting/frame_info.h",
"painting/gradient.cc",
"painting/gradient.h",
"painting/image.cc",
Expand Down
11 changes: 9 additions & 2 deletions lib/ui/compositing.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,21 @@ class Scene extends NativeFieldWrapperClass2 {

/// Creates a raster image representation of the current state of the scene.
/// This is a slow operation that is performed on a background thread.
///
/// Callers must dispose the [Image] when they are done with it. If the result
/// will be shared with other methods or classes, [Image.clone] should be used
/// and each handle created must be disposed.
Future<Image> toImage(int width, int height) {
if (width <= 0 || height <= 0) {
throw Exception('Invalid image dimensions.');
}
return _futurize((_Callback<Image> callback) => _toImage(width, height, callback));
return _futurize((_Callback<Image> callback) => _toImage(width, height, (_Image image) {
Copy link
Member

@goderbauer goderbauer Sep 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The documentation on the method toImage needs updating explaining that you get a handle to an image that needs to be disposed when you're done with it.

Copy link
Contributor Author

@dnfield dnfield Sep 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added some more details here.

callback(Image._(image));
}),
);
}

String _toImage(int width, int height, _Callback<Image> callback) native 'Scene_toImage';
String _toImage(int width, int height, _Callback<_Image> callback) native 'Scene_toImage';

/// Releases the resources used by this scene.
///
Expand Down
2 changes: 0 additions & 2 deletions lib/ui/dart_ui.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
#include "flutter/lib/ui/painting/codec.h"
#include "flutter/lib/ui/painting/color_filter.h"
#include "flutter/lib/ui/painting/engine_layer.h"
#include "flutter/lib/ui/painting/frame_info.h"
#include "flutter/lib/ui/painting/gradient.h"
#include "flutter/lib/ui/painting/image.h"
#include "flutter/lib/ui/painting/image_descriptor.h"
Expand Down Expand Up @@ -70,7 +69,6 @@ void DartUI::InitForGlobal() {
DartRuntimeHooks::RegisterNatives(g_natives);
EngineLayer::RegisterNatives(g_natives);
FontCollection::RegisterNatives(g_natives);
FrameInfo::RegisterNatives(g_natives);
ImageDescriptor::RegisterNatives(g_natives);
ImageFilter::RegisterNatives(g_natives);
ImageShader::RegisterNatives(g_natives);
Expand Down
Loading