ozone/platform/wayland: Add support for wl_output_interface

ui/ozone/platform/wayland/fake_server.h

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_WAYLAND_FAKE_SERVER_H_
 #define UI_OZONE_PLATFORM_WAYLAND_FAKE_SERVER_H_
 
 #include <wayland-server-core.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_pump_libevent.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "ui/display/display.h"

[rjkroege, 2016/07/08 21:59:19]

What is this file for? Can you add a class comment?

[joone, 2016/07/20 00:07:20]

I removed display::Display dependency.

 
 struct wl_client;
 struct wl_display;
 struct wl_event_loop;
 struct wl_global;
 struct wl_resource;
 
 namespace wl {
 
 class ServerObject {
@@ skipping 60 matching lines @@
 };
 
 class Global {
  public:
   Global(const wl_interface* interface,
          const void* implementation,
          uint32_t version);
   virtual ~Global();
 
   bool Initialize(wl_display* display);
+  virtual void OnBind() {}
 
   // The first bound resource to this global, which is usually all that is
   // useful when testing a simple client.
   wl_resource* resource() { return resource_; }
 
   static void Bind(wl_client* client,
                    void* data,
                    uint32_t version,
                    uint32_t id);
   static void OnResourceDestroyed(wl_resource* resource);
@@ skipping 15 matching lines @@
   ~MockCompositor() override;
 
   void AddSurface(std::unique_ptr<MockSurface> surface);
 
  private:
   std::vector<std::unique_ptr<MockSurface>> surfaces_;
 
   DISALLOW_COPY_AND_ASSIGN(MockCompositor);
 };
 
+class MockOutput : public Global {
+ public:
+  MockOutput();
+  ~MockOutput() override;
+  void SetDisplay(const display::Display& display) { fake_display_ = display; }
+  const display::Display& Display() { return fake_display_; }
+  void OnBind() override;
+
+ private:
+  display::Display fake_display_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockOutput);
+};
+
 class MockSeat : public Global {
  public:
   MockSeat();
   ~MockSeat() override;
 
   std::unique_ptr<MockPointer> pointer;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSeat);
 };
@@ skipping 25 matching lines @@
   // ensuring that this file descriptor gets closed (for example, by calling
   // wl_display_connect).
   bool Start();
 
   // Pause the server when it becomes idle.
   void Pause();
 
   // Resume the server after flushing client connections.
   void Resume();
 
+  void AddDisplay(const display::Display&);
+
   template <typename T>
   T* GetObject(uint32_t id) {
     wl_resource* resource = wl_client_get_object(client_, id);
     return resource ? T::FromResource(resource) : nullptr;
   }
 
   MockSeat* seat() { return &seat_; }
   MockXdgShell* xdg_shell() { return &xdg_shell_; }
 
  private:
   void DoPause();
 
   std::unique_ptr<base::MessagePump> CreateMessagePump();
 
   // base::MessagePumpLibevent::Watcher
   void OnFileCanReadWithoutBlocking(int fd) override;
   void OnFileCanWriteWithoutBlocking(int fd) override;
 
   std::unique_ptr<wl_display, DisplayDeleter> display_;
   wl_client* client_ = nullptr;
   wl_event_loop* event_loop_ = nullptr;
 
   base::WaitableEvent pause_event_;
   base::WaitableEvent resume_event_;
   bool paused_ = false;
 
   MockCompositor compositor_;
+  MockOutput output_;
   MockSeat seat_;
   MockXdgShell xdg_shell_;
 
   base::MessagePumpLibevent::FileDescriptorWatcher controller_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeServer);
 };
 
 }  // namespace wl
 
 #endif  // UI_OZONE_PLATFORM_WAYLAND_FAKE_SERVER_H_