mus: Remove ViewportMetrics from mojom.

components/mus/ws/platform_display.h

 // 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.
 
 #ifndef COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
 #define COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 40 matching lines @@
 class GpuState;
 class SurfacesState;
 class DisplayCompositor;
 
 namespace ws {
 
 class EventDispatcher;
 class PlatformDisplayFactory;
 class ServerWindow;
 
+struct ViewportMetrics {
+  gfx::Size size_in_pixels;
+  float device_scale_factor = 0.f;
+};
+
 // PlatformDisplay is used to connect the root ServerWindow to a display.
 class PlatformDisplay {
  public:
   virtual ~PlatformDisplay() {}
 
   static PlatformDisplay* Create(const PlatformDisplayInitParams& init_params);
 
   virtual void Init(PlatformDisplayDelegate* delegate) = 0;
 
   // Schedules a paint for the specified region in the coordinates of |window|.
   virtual void SchedulePaint(const ServerWindow* window,
                              const gfx::Rect& bounds) = 0;
 
   virtual void SetViewportSize(const gfx::Size& size) = 0;
 
   virtual void SetTitle(const base::string16& title) = 0;
 
   virtual void SetCapture() = 0;
 
   virtual void ReleaseCapture() = 0;
 
   virtual void SetCursorById(int32_t cursor) = 0;
 
   virtual mojom::Rotation GetRotation() = 0;
 
-  virtual const mojom::ViewportMetrics& GetViewportMetrics() = 0;
+  virtual float GetDeviceScaleFactor() = 0;
 
   virtual void UpdateTextInputState(const ui::TextInputState& state) = 0;
   virtual void SetImeVisibility(bool visible) = 0;
 
   // Returns true if a compositor frame has been submitted but not drawn yet.
   virtual bool IsFramePending() const = 0;
 
   virtual void RequestCopyOfOutput(
       std::unique_ptr<cc::CopyOutputRequest> output_request) = 0;
 
@@ skipping 18 matching lines @@
 
   // PlatformDisplay:
   void Init(PlatformDisplayDelegate* delegate) override;
   void SchedulePaint(const ServerWindow* window,
                      const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   void SetTitle(const base::string16& title) override;
   void SetCapture() override;
   void ReleaseCapture() override;
   void SetCursorById(int32_t cursor) override;
-  const mojom::ViewportMetrics& GetViewportMetrics() override;
+  float GetDeviceScaleFactor() override;
   mojom::Rotation GetRotation() override;
   void UpdateTextInputState(const ui::TextInputState& state) override;
   void SetImeVisibility(bool visible) override;
   bool IsFramePending() const override;
   void RequestCopyOfOutput(
       std::unique_ptr<cc::CopyOutputRequest> output_request) override;
 
  private:
   void WantToDraw();
 
   // This method initiates a top level redraw of the display.
   // TODO(fsamuel): This should use vblank as a signal rather than a timer
   // http://crbug.com/533042
   void Draw();
 
   // This is called after cc::Display has completed generating a new frame
   // for the display. TODO(fsamuel): Idle time processing should happen here
   // if there is budget for it.
   void DidDraw(cc::SurfaceDrawStatus status);
-  void UpdateMetrics(const gfx::Size& size, float device_pixel_ratio);
+  void UpdateMetrics(const gfx::Size& size, float device_scale_factor);
   std::unique_ptr<cc::CompositorFrame> GenerateCompositorFrame();
 
   // ui::PlatformWindowDelegate:
   void OnBoundsChanged(const gfx::Rect& new_bounds) override;
   void OnDamageRect(const gfx::Rect& damaged_region) override;
   void DispatchEvent(ui::Event* event) override;
   void OnCloseRequest() override;
   void OnClosed() override;
   void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
   void OnLostCapture() override;
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
-                                    float device_pixel_ratio) override;
+                                    float device_scale_factor) override;
   void OnAcceleratedWidgetDestroyed() override;
   void OnActivationChanged(bool active) override;
 
   scoped_refptr<GpuState> gpu_state_;
   scoped_refptr<SurfacesState> surfaces_state_;
   PlatformDisplayDelegate* delegate_;
 
-  mojom::ViewportMetrics metrics_;
+  ViewportMetrics metrics_;
   gfx::Rect dirty_rect_;
   base::Timer draw_timer_;
   bool frame_pending_;
 
   std::unique_ptr<DisplayCompositor> display_compositor_;
   std::unique_ptr<ui::PlatformWindow> platform_window_;
 
 #if !defined(OS_ANDROID)
   std::unique_ptr<ui::CursorLoader> cursor_loader_;
 #endif
 
   base::WeakPtrFactory<DefaultPlatformDisplay> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_