Plumb display metrics into SkyView

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"
+#include "sky/engine/public/platform/sky_display_metrics.h"
+#include "sky/engine/public/platform/sky_display_metrics.h"
 #include "sky/engine/public/web/Sky.h"
 #include "sky/engine/public/web/WebLocalFrame.h"
 #include "sky/engine/public/web/WebSettings.h"
 #include "sky/engine/public/web/WebView.h"
 #include "sky/services/platform/platform_impl.h"
 #include "sky/shell/service_provider.h"
 #include "sky/shell/ui/animator.h"
 #include "sky/shell/ui/input_event_converter.h"
 #include "sky/shell/ui/internals.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 60 matching lines @@
 
   SkRTreeFactory factory;
   SkPictureRecorder recorder;
   auto canvas = skia::SharePtr(recorder.beginRecording(
       physical_size_.width(), physical_size_.height(), &factory,
       SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag));
 
   if (sky_view_) {
     skia::RefPtr<SkPicture> picture = sky_view_->Paint();
     canvas->clear(SK_ColorBLACK);
+    canvas->scale(device_pixel_ratio_, device_pixel_ratio_);
     if (picture)
       canvas->drawPicture(picture.get());
   }
 
   if (web_view_)
     web_view_->paint(canvas.get(), blink::WebRect(gfx::Rect(physical_size_)));
 
   return skia::AdoptRef(recorder.endRecordingAsPicture());
 }
 
@@ skipping 13 matching lines @@
 void Engine::OnOutputSurfaceDestroyed() {
   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 (web_view_)
     UpdateWebViewSize();
 }
 
 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()));
 }
 
 // TODO(eseidel): This is likely not needed anymore.
 blink::WebScreenInfo Engine::screenInfo() {
   blink::WebScreenInfo screen;
   screen.rect = blink::WebRect(gfx::Rect(physical_size_));
   screen.availableRect = screen.rect;
   screen.deviceScaleFactor = device_pixel_ratio_;
   return screen;
 }
 
 void Engine::OnInputEvent(InputEventPtr event) {
   TRACE_EVENT0("sky", "Engine::OnInputEvent");
   scoped_ptr<blink::WebInputEvent> web_event =
       ConvertEvent(event, device_pixel_ratio_);
   if (!web_event)
     return;
-  web_view_->handleInputEvent(*web_event);
+  if (web_view_)
+    web_view_->handleInputEvent(*web_event);
 }
 
 void Engine::LoadURL(const mojo::String& url) {
   // Enable SkyView here.
   if (false) {
     sky_view_ = blink::SkyView::Create(this);
     sky_view_->Load(GURL(url));
     return;
   }
 
@@ skipping 46 matching lines @@
 
 void Engine::DidNavigateLocally(const mojo::String& url) {
 }
 
 void Engine::RequestNavigateHistory(int32_t delta) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace shell
 }  // namespace sky