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

Fix crash in copypixelbuffer (flutter/engine#10326)

Browse Source
This commit is contained in:
WATER1350 2019-10-05 04:21:17 +08:00 committed by Chris Bracken
parent 46149914bb
commit bf73ca111d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/src/flutter/shell/platform/darwin/ios/ios_external_texture_gl.h
View File

@ -7,6 +7,7 @@
#include "flutter/flow/texture.h"
#include "flutter/fml/platform/darwin/cf_utils.h"
#include "flutter/fml/platform/darwin/scoped_nsobject.h"
#include "flutter/shell/platform/darwin/ios/framework/Headers/FlutterTexture.h"
namespace flutter {
@ -33,7 +34,7 @@ class IOSExternalTextureGL : public flutter::Texture {
bool NeedUpdateTexture(bool freeze);
bool new_frame_ready_ = false;
NSObject<FlutterTexture>* external_texture_;
fml::scoped_nsobject<NSObject<FlutterTexture>> external_texture_;
fml::CFRef<CVOpenGLESTextureCacheRef> cache_ref_;
fml::CFRef<CVOpenGLESTextureRef> texture_ref_;
fml::CFRef<CVPixelBufferRef> buffer_ref_;

5
engine/src/flutter/shell/platform/darwin/ios/ios_external_texture_gl.mm
View File

@ -16,7 +16,8 @@ namespace flutter {
IOSExternalTextureGL::IOSExternalTextureGL(int64_t textureId,
NSObject<FlutterTexture>* externalTexture)
: Texture(textureId), external_texture_(externalTexture) {
: Texture(textureId),
external_texture_(fml::scoped_nsobject<NSObject<FlutterTexture>>([externalTexture retain])) {
FML_DCHECK(external_texture_);
}
@ -65,7 +66,7 @@ void IOSExternalTextureGL::Paint(SkCanvas& canvas,
GrContext* context) {
EnsureTextureCacheExists();
if (NeedUpdateTexture(freeze)) {
auto pixelBuffer = [external_texture_ copyPixelBuffer];
auto pixelBuffer = [external_texture_.get() copyPixelBuffer];
if (pixelBuffer) {
buffer_ref_.Reset(pixelBuffer);
}