Merge ozone-mir:compile-with-mir into ozone-mir:ozone-mir

[Andrea Azzarone]

Initial branch to create the chromium/ozone/mir platform.

diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index b5746be..e24b0f8 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -42,6 +42,11 @@ if (ozone_platform_wayland) {
   ozone_platform_test_deps += [ "platform/wayland:wayland_unittests" ]
 }
 
+if (ozone_platform_mir) {
+  ozone_platforms += [ "mir" ]
+  ozone_platform_deps += [ "platform/mir" ]
+}
+
 if (ozone_platform_x11) {
   ozone_platforms += [ "x11" ]
   ozone_platform_deps += [ "platform/x11" ]
diff --git a/ui/ozone/ozone.gni b/ui/ozone/ozone.gni
index b677b48..d711a18 100644
--- a/ui/ozone/ozone.gni
+++ b/ui/ozone/ozone.gni
@@ -27,6 +27,7 @@ declare_args() {
   ozone_platform_headless = false
   ozone_platform_x11 = false
   ozone_platform_wayland = false
+  ozone_platform_mir = false
 
   if (ozone_auto_platforms) {
     # Use headless as the default platform.
@@ -55,6 +56,7 @@ declare_args() {
     } else if (is_desktop_linux) {
       ozone_platform_wayland = true
       ozone_platform_x11 = true
+      ozone_platform_mir = true
     }
   }
 }
diff --git a/ui/ozone/platform/mir/BUILD.gn b/ui/ozone/platform/mir/BUILD.gn
new file mode 100644
index 0000000..f3dd99d
--- /dev/null
+++ b/ui/ozone/platform/mir/BUILD.gn
@@ -0,0 +1,42 @@
+## Copyright 2017 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.
+
+visibility = [ "//ui/ozone/*" ]
+
+import("//build/config/linux/pkg_config.gni")
+
+pkg_config("mirclient") {
+  packages = [ "mirclient" ]
+}
+
+source_set("mir") {
+  sources = [
+    "client_native_pixmap_factory_mir.cc",
+    "client_native_pixmap_factory_mir.h",
+    "mir_window.cc",
+    "mir_window.h",
+    "ozone_platform_mir.cc",
+    "ozone_platform_mir.h"
+  ]
+
+  deps = [
+    "//base",
+    "//skia",
+    "//ui/display",
+    "//ui/events",
+    "//ui/events/platform",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+    "//ui/ozone:ozone_base",
+    "//ui/ozone/common",
+    "//ui/platform_window",
+  ]
+
+  defines = [ "OZONE_IMPLEMENTATION" ]
+
+  configs += [
+    ":mirclient",
+    "//third_party/khronos:khronos_headers"
+  ]
+}
diff --git a/ui/ozone/platform/mir/client_native_pixmap_factory_mir.cc b/ui/ozone/platform/mir/client_native_pixmap_factory_mir.cc
new file mode 100644
index 0000000..e2a24a9
--- /dev/null
+++ b/ui/ozone/platform/mir/client_native_pixmap_factory_mir.cc
@@ -0,0 +1,15 @@
+// Copyright 2017 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 "ui/ozone/platform/mir/client_native_pixmap_factory_mir.h"
+
+#include "ui/ozone/common/stub_client_native_pixmap_factory.h"
+
+namespace ui {
+
+ClientNativePixmapFactory* CreateClientNativePixmapFactoryMir() {
+  return CreateStubClientNativePixmapFactory();
+}
+
+}  // namespace ui
diff --git a/ui/ozone/platform/mir/client_native_pixmap_factory_mir.h b/ui/ozone/platform/mir/client_native_pixmap_factory_mir.h
new file mode 100644
index 0000000..a65b288
--- /dev/null
+++ b/ui/ozone/platform/mir/client_native_pixmap_factory_mir.h
@@ -0,0 +1,17 @@
+// Copyright 2017 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_MIR_CLIENT_NATIVE_PIXMAP_FACTORY_MIR_H_
+#define UI_OZONE_PLATFORM_MIR_CLIENT_NATIVE_PIXMAP_FACTORY_MIR_H_
+
+namespace ui {
+
+class ClientNativePixmapFactory;
+
+// Constructor hook for use in constructor_list.cc
+ClientNativePixmapFactory* CreateClientNativePixmapFactoryMir();
+
+}  // namespace ui
+
+#endif  // UI_OZONE_PLATFORM_MIR_CLIENT_NATIVE_PIXMAP_FACTORY_MIR_H_
diff --git a/ui/ozone/platform/mir/mir_window.cc b/ui/ozone/platform/mir/mir_window.cc
new file mode 100644
index 0000000..9835650
--- /dev/null
+++ b/ui/ozone/platform/mir/mir_window.cc
@@ -0,0 +1,84 @@
+// Copyright 2017 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 "ui/ozone/platform/mir/mir_window.h"
+
+#include "base/logging.h"
+
+namespace ui {
+
+
+MirWindow::MirWindow() {
+}
+
+MirWindow::~MirWindow() {
+}
+
+void MirWindow::Show() {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::Hide() {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::Close() {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::SetBounds(const gfx::Rect& bounds) {
+  NOTIMPLEMENTED();
+}
+
+gfx::Rect MirWindow::GetBounds() {
+  NOTIMPLEMENTED();
+  return gfx::Rect(0, 0);
+}
+
+void MirWindow::SetTitle(const base::string16& title) {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::SetCapture() {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::ReleaseCapture() {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::ToggleFullscreen() {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::Maximize() {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::Minimize() {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::Restore() {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::SetCursor(PlatformCursor cursor) {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::MoveCursorTo(const gfx::Point& location) {
+  NOTIMPLEMENTED();
+}
+
+void MirWindow::ConfineCursorToBounds(const gfx::Rect& bounds) {
+  NOTIMPLEMENTED();
+}
+
+PlatformImeController* MirWindow::GetPlatformImeController() {
+  NOTIMPLEMENTED();
+  return nullptr;
+}
+
+}  // namespace ui
diff --git a/ui/ozone/platform/mir/mir_window.h b/ui/ozone/platform/mir/mir_window.h
new file mode 100644
index 0000000..25114c2
--- /dev/null
+++ b/ui/ozone/platform/mir/mir_window.h
@@ -0,0 +1,48 @@
+// Copyright 2017 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_MIR_MIR_WINDOW_H_
+#define UI_OZONE_PLATFORM_MIR_MIR_WINDOW_H_
+
+#include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/native_widget_types.h"
+#include "ui/platform_window/platform_window.h"
+
+namespace ui {
+
+class MirWindow : public PlatformWindow {
+ public:
+  MirWindow();
+  ~MirWindow() override;
+
+  void Show() override;
+  void Hide() override;
+  void Close() override;
+
+  void SetBounds(const gfx::Rect& bounds) override;
+  gfx::Rect GetBounds() override;
+
+  void SetTitle(const base::string16& title) override;
+
+  void SetCapture() override;
+  void ReleaseCapture() override;
+
+  void ToggleFullscreen() override;
+  void Maximize() override;
+  void Minimize() override;
+  void Restore() override;
+
+  void SetCursor(PlatformCursor cursor) override;
+  void MoveCursorTo(const gfx::Point& location) override;
+  void ConfineCursorToBounds(const gfx::Rect& bounds) override;
+
+  PlatformImeController* GetPlatformImeController() override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MirWindow);
+};
+
+}  // namespace ui
+
+#endif  // UI_OZONE_PLATFORM_MIR_MIR_WINDOW_H_
diff --git a/ui/ozone/platform/mir/ozone_platform_mir.cc b/ui/ozone/platform/mir/ozone_platform_mir.cc
new file mode 100644
index 0000000..c85cdd7
--- /dev/null
+++ b/ui/ozone/platform/mir/ozone_platform_mir.cc
@@ -0,0 +1,98 @@
+// Copyright 2017 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 "ui/ozone/platform/mir/ozone_platform_mir.h"
+
+#include "base/memory/ptr_util.h"
+#include "base/logging.h"
+#include "ui/display/fake_display_delegate.h"
+#include "ui/ozone/common/stub_overlay_manager.h"
+#include "ui/ozone/platform/mir/mir_window.h"
+#include "ui/ozone/public/cursor_factory_ozone.h"
+#include "ui/ozone/public/gpu_platform_support_host.h"
+#include "ui/ozone/public/input_controller.h"
+#include "ui/ozone/public/ozone_platform.h"
+#include "ui/ozone/public/system_input_injector.h"
+
+namespace ui {
+
+namespace {
+
+class OzonePlatformMir : public OzonePlatform {
+ public:
+  OzonePlatformMir() {}
+  ~OzonePlatformMir() override {}
+
+  // OzonePlatform
+  SurfaceFactoryOzone* GetSurfaceFactoryOzone() override {
+    NOTIMPLEMENTED();
+    return nullptr;
+  }
+
+  OverlayManagerOzone* GetOverlayManager() override {
+    NOTIMPLEMENTED();
+    return nullptr;
+  }
+
+  CursorFactoryOzone* GetCursorFactoryOzone() override {
+    NOTIMPLEMENTED();
+    return nullptr;
+  }
+
+  InputController* GetInputController() override {
+    NOTIMPLEMENTED();
+    return nullptr;
+  }
+
+  GpuPlatformSupportHost* GetGpuPlatformSupportHost() override {
+    NOTIMPLEMENTED();
+    return nullptr;
+  }
+
+  std::unique_ptr<SystemInputInjector> CreateSystemInputInjector() override {
+    NOTIMPLEMENTED();
+    return nullptr;
+  }
+
+  std::unique_ptr<PlatformWindow> CreatePlatformWindow(
+      PlatformWindowDelegate* delegate,
+      const gfx::Rect& bounds) override {
+    NOTIMPLEMENTED();
+    return nullptr;
+  }
+
+  std::unique_ptr<display::NativeDisplayDelegate> CreateNativeDisplayDelegate()
+      override {
+    return base::MakeUnique<display::FakeDisplayDelegate>();
+  }
+
+  void InitializeUI() override {
+    InitParams default_params;
+    InitializeUI(default_params);
+  }
+
+  void InitializeUI(const InitParams& args) override {
+    NOTIMPLEMENTED();
+  }
+
+  void InitializeGPU() override {
+    InitParams default_params;
+    InitializeGPU(default_params);
+  }
+
+  void InitializeGPU(const InitParams& args) override {
+    NOTIMPLEMENTED();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(OzonePlatformMir);
+};
+
+}  // namespace
+
+OzonePlatform* CreateOzonePlatformMir() {
+  return new OzonePlatformMir;
+}
+
+}  // namespace ui
diff --git a/ui/ozone/platform/mir/ozone_platform_mir.h b/ui/ozone/platform/mir/ozone_platform_mir.h
new file mode 100644
index 0000000..cf72231
--- /dev/null
+++ b/ui/ozone/platform/mir/ozone_platform_mir.h
@@ -0,0 +1,17 @@
+// Copyright 2017 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_MIR_OZONE_PLATFORM_MIR_H_
+#define UI_OZONE_PLATFORM_MIR_OZONE_PLATFORM_MIR_H_
+
+namespace ui {
+
+class OzonePlatform;
+
+// Constructor hook for use in ozone_platform_list.cc
+OzonePlatform* CreateOzonePlatformMir();
+
+}  // namespace ui
+
+#endif  // UI_OZONE_PLATFORM_MIR_OZONE_PLATFORM_MIR_H_