firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix windows build by using lambda capture workaround (flutter/engine#4514)

Browse Source 
* Fix windows build by using lambda capture workaround

* clang format, add todo

* clang-format again
This commit is contained in:
Alexander Aprelev
2018-01-04 10:41:54 -08:00
committed by GitHub
parent a4ae031706
commit a6d6f56e67
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
engine/src/flutter/shell/common/shell.cc
View File

@@ -331,27 +331,33 @@ void Shell::SetAssetBundlePathInPlatformViewUIThread(
*view_existed = false;
IteratePlatformViews([
view_id, // argument
assets_directory = std::move(assets_directory), // argument
&view_existed, // out
&dart_isolate_id, // out
&isolate_name // out
](PlatformView * view)
->bool {
if (reinterpret_cast<uintptr_t>(view) != view_id) {
// Keep looking.
return true;
}
*view_existed = true;
view->SetAssetBundlePath(assets_directory);
*dart_isolate_id =
view->engine().GetUIIsolateMainPort();
*isolate_name = view->engine().GetUIIsolateName();
// We found the requested view. Stop iterating over
// platform views.
return false;
});
IteratePlatformViews(
[view_id, // argument
#if !defined(OS_WIN)
// Using std::move on const references inside lambda capture is
// not supported on Windows for some reason.
// TODO(https://github.com/flutter/flutter/issues/13908):
// Investigate the root cause of the difference.
assets_directory = std::move(assets_directory), // argument
#else
assets_directory, // argument
#endif
&view_existed, // out
&dart_isolate_id, // out
&isolate_name // out
](PlatformView* view) -> bool {
if (reinterpret_cast<uintptr_t>(view) != view_id) {
// Keep looking.
return true;
}
*view_existed = true;
view->SetAssetBundlePath(assets_directory);
*dart_isolate_id = view->engine().GetUIIsolateMainPort();
*isolate_name = view->engine().GetUIIsolateName();
// We found the requested view. Stop iterating over
// platform views.
return false;
});
latch->Signal();
}