DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use a new Skia API for safe passing of images across threads and GrContexts (flutter/engine#3705)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/9439
This commit is contained in:
Jason Simmons 2017-05-22 17:26:56 -07:00 committed by GitHub
parent 767feb8735
commit 24d5ede97c
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
engine/src/flutter/lib/ui/painting/image_decoding.cc
View File

@ -16,10 +16,6 @@
#include "lib/tonic/typed_data/uint8_list.h"
#include "third_party/skia/include/core/SkImageGenerator.h"
#ifdef OS_ANDROID
#include <GLES2/gl2.h>
#endif
using tonic::DartInvoke;
using tonic::DartPersistentValue;
using tonic::ToDart;
@ -34,24 +30,14 @@ sk_sp<SkImage> DecodeImage(sk_sp<SkData> buffer) {
return nullptr;
}
auto raster_image = SkImage::MakeFromEncoded(std::move(buffer));
if (raster_image == nullptr) {
return nullptr;
}
if (auto context = ResourceContext::Get()) {
GrContext* context = ResourceContext::Get();
if (context) {
// TODO: Supply actual destination color space once available
if (auto texture_image =
raster_image->makeTextureImage(context, nullptr)) {
#ifdef OS_ANDROID
glFlush();
#endif
return texture_image;
}
return SkImage::MakeCrossContextFromEncoded(context, std::move(buffer),
false, nullptr);
} else {
return SkImage::MakeFromEncoded(std::move(buffer));
}
return raster_image;
}
void InvokeImageCallback(sk_sp<SkImage> image,