Various fixes in preparation for deploying

sky/shell/ui/engine.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sky/shell/ui/engine.h"
 
 #include "base/bind.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "sky/engine/public/platform/WebInputEvent.h"
@@ skipping 109 matching lines @@
   config_.gpu_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&GPUDelegate::OnOutputSurfaceDestroyed, config_.gpu_delegate));
 }
 
 void Engine::OnViewportMetricsChanged(int width, int height,
                                       float device_pixel_ratio) {
   physical_size_.SetSize(width, height);
   device_pixel_ratio_ = device_pixel_ratio;
 
-  if (sky_view_) {
-    blink::SkyDisplayMetrics metrics;
-    metrics.physical_size = physical_size_;
-    metrics.device_pixel_ratio = device_pixel_ratio_;
-    sky_view_->SetDisplayMetrics(metrics);
-  }
+  if (sky_view_)
+    UpdateSkyViewSize();
 
   if (web_view_)
     UpdateWebViewSize();
 }
 
+void Engine::UpdateSkyViewSize()
+{

[abarth-chromium, 2015/06/04 23:46:42]

These two lines should be merged.

+  CHECK(sky_view_);
+  blink::SkyDisplayMetrics metrics;
+  metrics.physical_size = physical_size_;
+  metrics.device_pixel_ratio = device_pixel_ratio_;
+  sky_view_->SetDisplayMetrics(metrics);
+}
+
 void Engine::UpdateWebViewSize()
 {
   CHECK(web_view_);
   web_view_->setDeviceScaleFactor(device_pixel_ratio_);
   gfx::SizeF size = gfx::ScaleSize(physical_size_, 1 / device_pixel_ratio_);
   // FIXME: We should be able to set the size of the WebView in floating point
   // because its in logical pixels.
   web_view_->resize(blink::WebSize(size.width(), size.height()));
 }
 
@@ skipping 14 matching lines @@
     return;
   if (sky_view_)
     sky_view_->HandleInputEvent(*web_event);
   if (web_view_)
     web_view_->handleInputEvent(*web_event);
 }
 
 void Engine::LoadURL(const mojo::String& mojo_url) {
   GURL url(mojo_url);
   if (!blink::WebView::shouldUseWebView(url)) {
+    if (web_view_) {
+      web_view_->close();
+      web_view_ = nullptr;
+    }
     sky_view_ = blink::SkyView::Create(this);
     sky_view_->Load(url);
+    UpdateSkyViewSize();
     return;
   }
 
   LOG(WARNING) << ".sky support is deprecated, please use .dart for main()";
 
   // Something bad happens if you try to call WebView::close and replace
   // the webview.  So for now we just load into the existing one. :/
   if (!web_view_)
     web_view_ = blink::WebView::create(this);
   ConfigureSettings(web_view_->settings());
@@ skipping 46 matching lines @@
 
 void Engine::DidNavigateLocally(const mojo::String& url) {
 }
 
 void Engine::RequestNavigateHistory(int32_t delta) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace shell
 }  // namespace sky