Handle modified displays in mustash.

services/ui/ws/test_utils.cc

 // Copyright 2016 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/test_utils.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 36 matching lines @@
   int64_t GetId() const override { return id_; }
   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(mojom::Cursor cursor) override {
     *cursor_storage_ = cursor;
   }
-  display::Display::Rotation GetRotation() override {
-    return display::Display::Rotation::ROTATE_0;
-  }
-  float GetDeviceScaleFactor() override {
-    return display_metrics_.device_scale_factor;
-  }
   void UpdateTextInputState(const ui::TextInputState& state) override {}
   void SetImeVisibility(bool visible) override {}
   bool IsFramePending() const override { return false; }
   void RequestCopyOfOutput(
       std::unique_ptr<cc::CopyOutputRequest> output_request) override {}
   gfx::Rect GetBounds() const override { return display_metrics_.bounds; }
+  bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override {
+    if (display_metrics_ == metrics)
+      return false;
+    display_metrics_ = metrics;
+    return true;
+  }
+  const display::ViewportMetrics& GetViewportMetrics() const override {
+    return display_metrics_;
+  }
   bool IsPrimaryDisplay() const override { return is_primary_; }
   void OnGpuChannelEstablished(
       scoped_refptr<gpu::GpuChannelHost> host) override {}
 
  private:
-  ViewportMetrics display_metrics_;
+  display::ViewportMetrics display_metrics_;
 
   int64_t id_;
   bool is_primary_;
   mojom::Cursor* cursor_storage_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPlatformDisplay);
 };
 
 ClientWindowId NextUnusedClientWindowId(WindowTree* tree) {
   ClientWindowId client_id;
@@ skipping 52 matching lines @@
 TestFrameGeneratorDelegate::~TestFrameGeneratorDelegate() {}
 
 ServerWindow* TestFrameGeneratorDelegate::GetRootWindow() {
   return root_.get();
 }
 
 bool TestFrameGeneratorDelegate::IsInHighContrastMode() {
   return false;
 }
 
-const ViewportMetrics& TestFrameGeneratorDelegate::GetViewportMetrics() {
+const display::ViewportMetrics& TestFrameGeneratorDelegate::GetViewportMetrics()
+    const {
   return metrics_;
 }
 
 // WindowTreeTestApi  ---------------------------------------------------------
 
 WindowTreeTestApi::WindowTreeTestApi(WindowTree* tree) : tree_(tree) {}
 WindowTreeTestApi::~WindowTreeTestApi() {}
 
 void WindowTreeTestApi::StartPointerWatcher(bool want_moves) {
   tree_->StartPointerWatcher(want_moves);
@@ skipping 450 matching lines @@
     return nullptr;
   if (!tree->AddWindow(parent_client_id, client_window_id))
     return nullptr;
   *client_id = client_window_id;
   return tree->GetWindowByClientId(client_window_id);
 }
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui