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

* Fix windows build by using lambda capture workaround * clang format, add todo * clang-format again
Eistrong · Jan 4, 2018 · f6ea8f3 · f6ea8f3
1 parent 6bacf45
commit f6ea8f3
Showing 1 changed file with 27 additions and 21 deletions.
diff --git a/shell/common/shell.cc b/shell/common/shell.cc
@@ -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();
 }