Update buildroot and re-enable use of C++14 on Android x86. (flutter/engine#3096)

This commit is contained in:
Chinmay Garde 2016-10-04 12:53:08 -07:00 committed by GitHub
parent 62dc1d9ce9
commit 559d585233
2 changed files with 7 additions and 6 deletions

2
DEPS
View File

@ -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
#

View File

@ -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<char*>(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<PointerDataPacket>(data, position)
] {
if (engine.get())
engine->HandlePointerDataPacket(*packet);
delete packet;
});
}));
}
void PlatformViewAndroid::ReleaseSurface() {