From 559d58523333480da67a2082617ff5842539bb8b Mon Sep 17 00:00:00 2001 From: Chinmay Garde Date: Tue, 4 Oct 2016 12:53:08 -0700 Subject: [PATCH] Update buildroot and re-enable use of C++14 on Android x86. (flutter/engine#3096) --- DEPS | 2 +- .../shell/platform/android/platform_view_android.cc | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/DEPS b/DEPS index ba5116a23dd..7fb549a24e0 100644 --- a/DEPS +++ b/DEPS @@ -45,7 +45,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f0e80ac2a4abfd5af99c57e2da3a1b0f87aecb92', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '9dcb5b06fe497f1bfd563e2c9293161070d5340c', # Fuchsia compatibility # diff --git a/engine/src/flutter/shell/platform/android/platform_view_android.cc b/engine/src/flutter/shell/platform/android/platform_view_android.cc index f7edb76021a..9824ff246de 100644 --- a/engine/src/flutter/shell/platform/android/platform_view_android.cc +++ b/engine/src/flutter/shell/platform/android/platform_view_android.cc @@ -24,6 +24,7 @@ #include "flutter/shell/common/engine.h" #include "flutter/shell/common/shell.h" #include "jni/FlutterView_jni.h" +#include "lib/ftl/functional/wrap_lambda.h" #include "third_party/skia/include/core/SkSurface.h" namespace shell { @@ -430,13 +431,13 @@ void PlatformViewAndroid::DispatchPointerDataPacket(JNIEnv* env, jint position) { char* data = static_cast(env->GetDirectBufferAddress(buffer)); - auto engine = engine_->GetWeakPtr(); - PointerDataPacket* packet = new PointerDataPacket(data, position); - blink::Threads::UI()->PostTask([engine, packet] { + blink::Threads::UI()->PostTask(ftl::WrapLambda([ + engine = engine_->GetWeakPtr(), + packet = std::make_unique(data, position) + ] { if (engine.get()) engine->HandlePointerDataPacket(*packet); - delete packet; - }); + })); } void PlatformViewAndroid::ReleaseSurface() {