From 413080ef6a32f573c3ebf1bb41783aae3976e61b Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Tue, 9 Jun 2015 15:10:14 -0700 Subject: [PATCH] Make it possible to navigate from a SkyView to a WebView. This would occur when bringing SkyDemo to the front after having viewed a SkyView based demo and then paused the SkyActivity (by going to the Android Launcher, etc.) I also fixed deploy_domokit_site.py to ignore .gitignore files found in packages. We should actually probably ignore these when creating the packages in the first place, but this check seems valid regardless. The .gitignore for sky/lib/assets was causing the assets not to get pushed to the demo site. R=abarth@chromium.org, johnmccutchan@google.com Review URL: https://codereview.chromium.org/1163323007. --- engine/src/flutter/shell/ui/engine.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engine/src/flutter/shell/ui/engine.cc b/engine/src/flutter/shell/ui/engine.cc index 736cb3e07c3..f82922b8fcd 100644 --- a/engine/src/flutter/shell/ui/engine.cc +++ b/engine/src/flutter/shell/ui/engine.cc @@ -185,6 +185,9 @@ void Engine::LoadURL(const mojo::String& mojo_url) { return; } + if (sky_view_) + sky_view_ = nullptr; + LOG(WARNING) << ".sky support is deprecated, please use .dart for main()"; // Something bad happens if you try to call WebView::close and replace