Scale Sky contents by the device pixel ratio

sky/viewer/document_view.cc

 // Copyright 2014 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/viewer/document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "mojo/services/view_manager/public/cpp/view_manager.h"
 #include "skia/ext/refptr.h"
 #include "sky/compositor/layer.h"
 #include "sky/compositor/layer_host.h"
 #include "sky/engine/public/platform/Platform.h"
 #include "sky/engine/public/platform/WebHTTPHeaderVisitor.h"
+#include "sky/engine/public/platform/WebScreenInfo.h"
 #include "sky/engine/public/web/Sky.h"
 #include "sky/engine/public/web/WebConsoleMessage.h"
 #include "sky/engine/public/web/WebDocument.h"
 #include "sky/engine/public/web/WebElement.h"
 #include "sky/engine/public/web/WebInputEvent.h"
 #include "sky/engine/public/web/WebLocalFrame.h"
 #include "sky/engine/public/web/WebScriptSource.h"
 #include "sky/engine/public/web/WebSettings.h"
 #include "sky/engine/public/web/WebView.h"
 #include "sky/engine/v8_inspector/inspector_backend_mojo.h"
@@ skipping 67 matching lines @@
     mojo::View* root,
     mojo::ServiceProviderImpl* exported_services,
     scoped_ptr<mojo::ServiceProvider> imported_services) {
   root_ = root;
   imported_services_ = imported_services.Pass();
   navigator_host_.set_service_provider(imported_services_.get());
   exported_services->AddService(&inspector_service_factory_);
 
   Load(response_.Pass());
 
-  gfx::Size size = root_->bounds().To<gfx::Rect>().size();
-  web_view_->resize(size);
+  auto& bounds = root_->bounds();
+  float device_pixel_ratio = GetDevicePixelRatio();
+  web_view_->resize(blink::WebSize(bounds.width / device_pixel_ratio,
+                                   bounds.height / device_pixel_ratio));
+
   // TODO(abarth): We should ask the view whether it is focused instead of
   // assuming that we're focused.
   web_view_->setFocus(true);
   root_->AddObserver(this);
 }
 
 void DocumentView::OnViewManagerDisconnected(mojo::ViewManager* view_manager) {
   // TODO(aa): Need to figure out how shutdown works.
 }
 
@@ skipping 20 matching lines @@
 
 void DocumentView::BeginFrame(base::TimeTicks frame_time) {
   double frame_time_sec = (frame_time - base::TimeTicks()).InSecondsF();
   double deadline_sec = frame_time_sec;
   double interval_sec = 1.0/60;
   blink::WebBeginFrameArgs web_begin_frame_args(
       frame_time_sec, deadline_sec, interval_sec);
   web_view_->beginFrame(web_begin_frame_args);
   web_view_->layout();
   blink::WebSize size = web_view_->size();
-  root_layer_->SetSize(gfx::Size(size.width, size.height));
+  float device_pixel_ratio = GetDevicePixelRatio();
+  root_layer_->SetSize(gfx::Size(size.width * device_pixel_ratio,
+                                 size.height * device_pixel_ratio));
 }
 
 void DocumentView::OnSurfaceIdAvailable(mojo::SurfaceIdPtr surface_id) {
   if (root_)
     root_->SetSurfaceId(surface_id.Pass());
 }
 
 void DocumentView::PaintContents(SkCanvas* canvas, const gfx::Rect& clip) {
   blink::WebRect rect(clip.x(), clip.y(), clip.width(), clip.height());
   web_view_->paint(canvas, rect);
 }
 
 void DocumentView::scheduleAnimation() {
   DCHECK(web_view_);
   layer_host_->SetNeedsAnimate();
 }
 
+blink::WebScreenInfo DocumentView::screenInfo() {
+  DCHECK(root_);
+  auto& metrics = root_->viewport_metrics();
+  blink::WebScreenInfo screen;
+  screen.rect = blink::WebRect(0, 0, metrics.size->width, metrics.size->height);
+  screen.availableRect = screen.rect;
+  screen.deviceScaleFactor = metrics.device_pixel_ratio;
+  return screen;
+}
+
 mojo::View* DocumentView::createChildFrame(const blink::WebURL& url) {
   if (!root_)
     return nullptr;
 
   mojo::View* child = root_->view_manager()->CreateView();
   child->SetVisible(true);
   root_->AddChild(child);
   child->Embed(mojo::String::From(url.string().utf8()));
 
   return child;
 }
 
 void DocumentView::frameDetached(blink::WebFrame* frame) {
   // |frame| is invalid after here.
   frame->close();
 }
 
+float DocumentView::GetDevicePixelRatio() const {
+  if (root_)
+    return root_->viewport_metrics().device_pixel_ratio;
+  return 1.f;
+}
+
 blink::WebNavigationPolicy DocumentView::decidePolicyForNavigation(
     const blink::WebFrameClient::NavigationPolicyInfo& info) {
 
   navigator_host_->RequestNavigate(
       WebNavigationPolicyToNavigationTarget(info.defaultPolicy),
       mojo::URLRequest::From(info.urlRequest).Pass());
 
   return blink::WebNavigationPolicyIgnore;
 }
 
@@ skipping 78 matching lines @@
 void DocumentView::StartDebuggerInspectorBackend() {
   if (!inspector_backend_) {
     inspector_host_.reset(new InspectorHostImpl(web_view_, shell_));
     inspector_backend_.reset(
         new inspector::InspectorBackendMojo(inspector_host_.get()));
   }
   inspector_backend_->Connect();
 }
 
 }  // namespace sky