Start using display.mojom.Display in mus+ash.

services/ui/ws/display.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 "services/ui/ws/display.h"
 
 #include <set>
+#include <utility>
 #include <vector>
 
 #include "base/debug/debugger.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/common/common_type_converters.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
 #include "services/ui/common/types.h"
 #include "services/ui/ws/display_binding.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/focus_controller.h"
@@ skipping 55 matching lines @@
 }
 
 DisplayManager* Display::display_manager() {
   return window_server_->display_manager();
 }
 
 const DisplayManager* Display::display_manager() const {
   return window_server_->display_manager();
 }
 
-mojom::DisplayPtr Display::ToMojomDisplay() const {
-  mojom::DisplayPtr display_ptr = mojom::Display::New();
-  display_ptr = mojom::Display::New();
-  display_ptr->id = id_;
-  // TODO(sky): Display should know it's origin.
-  display_ptr->bounds.SetRect(0, 0, root_->bounds().size().width(),
-                              root_->bounds().size().height());
-  // TODO(sky): window manager needs an API to set the work area.
-  display_ptr->work_area = display_ptr->bounds;
-  display_ptr->device_pixel_ratio = platform_display_->GetDeviceScaleFactor();
-  display_ptr->rotation = platform_display_->GetRotation();
+mojom::WmDisplayPtr Display::ToWmDisplay() const {
+  mojom::WmDisplayPtr display_ptr = mojom::WmDisplay::New();
+
+  display_ptr->display = ToDisplay();
+
   // TODO(sky): make this real.
   display_ptr->is_primary = true;
   // TODO(sky): make this real.
-  display_ptr->touch_support = mojom::TouchSupport::UNKNOWN;
   display_ptr->frame_decoration_values = mojom::FrameDecorationValues::New();
   return display_ptr;
 }
 
+::display::Display Display::ToDisplay() const {
+  ::display::Display display(id_);
+
+  // TODO(sky): Display should know it's origin.

[Tom Sepez, 2016/07/19 16:22:25]

nit: its

[kylechar, 2016/07/19 18:55:20]

Done.

+  display.set_bounds(gfx::Rect(0, 0, root_->bounds().size().width(),
+                               root_->bounds().size().height()));
+  // TODO(sky): window manager needs an API to set the work area.
+  display.set_work_area(display.bounds());
+  display.set_device_scale_factor(platform_display_->GetDeviceScaleFactor());
+  display.set_rotation(platform_display_->GetRotation());
+  display.set_touch_support(
+      ::display::Display::TouchSupport::TOUCH_SUPPORT_UNKNOWN);
+
+  return display;
+}
+
 void Display::SchedulePaint(const ServerWindow* window,
                             const gfx::Rect& bounds) {
   DCHECK(root_->Contains(window));
   platform_display_->SchedulePaint(window, bounds);
 }
 
 void Display::ScheduleSurfaceDestruction(ServerWindow* window) {
   if (!platform_display_->IsFramePending()) {
     window->DestroySurfacesScheduledForDestruction();
     return;
   }
   if (windows_needing_frame_destruction_.count(window))
     return;
   windows_needing_frame_destruction_.insert(window);
   window->AddObserver(this);
 }
 
-mojom::Rotation Display::GetRotation() const {
+::display::Display::Rotation Display::GetRotation() const {
   return platform_display_->GetRotation();
 }
 
 gfx::Size Display::GetSize() const {
   return root_->bounds().size();
 }
 
 int64_t Display::GetPlatformDisplayId() const {
   return platform_display_->GetDisplayId();
 }
@@ skipping 284 matching lines @@
 }
 
 void Display::OnWindowManagerWindowTreeFactoryReady(
     WindowManagerWindowTreeFactory* factory) {
   if (!binding_)
     CreateWindowManagerDisplayRootFromFactory(factory);
 }
 
 }  // namespace ws
 }  // namespace ui