Merge ozone-mir:implement-create-platform-window into ozone-mir:ozone-mir

[Andrea Azzarone]

Move the AddWindow/RemoveWindow/GetWindow from MirConnectionWrapper to MirPlatformWindowManager.
Add tests for MirPlatformWindowManager.

diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index e24b0f8..b84363d 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -45,6 +45,7 @@ if (ozone_platform_wayland) {
 if (ozone_platform_mir) {
   ozone_platforms += [ "mir" ]
   ozone_platform_deps += [ "platform/mir" ]
+  ozone_platform_test_deps += [ "platform/mir:mir_unittests" ]
 }
 
 if (ozone_platform_x11) {
diff --git a/ui/ozone/platform/mir/BUILD.gn b/ui/ozone/platform/mir/BUILD.gn
index d54565e..48cc432 100644
--- a/ui/ozone/platform/mir/BUILD.gn
+++ b/ui/ozone/platform/mir/BUILD.gn
@@ -18,7 +18,9 @@ source_set("mir") {
     "mir_connection_wrapper.cc",
     "mir_connection_wrapper.h",
     "mir_platform_window.cc",
-    "mir_platoform_window.h",
+    "mir_platform_window.h",
+    "mir_platform_window_manager.cc",
+    "mir_platform_window_manager.h",
     "ozone_platform_mir.cc",
     "ozone_platform_mir.h"
   ]
@@ -43,3 +45,18 @@ source_set("mir") {
     "//third_party/khronos:khronos_headers"
   ]
 }
+
+source_set("mir_unittests") {
+  testonly = true
+
+  sources = [
+    "mir_platform_window_manager_unittest.cc"
+  ]
+
+  deps = [
+    ":mir",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}
+
diff --git a/ui/ozone/platform/mir/mir_connection_wrapper.cc b/ui/ozone/platform/mir/mir_connection_wrapper.cc
index 42cbf60..54e24ce 100644
--- a/ui/ozone/platform/mir/mir_connection_wrapper.cc
+++ b/ui/ozone/platform/mir/mir_connection_wrapper.cc
@@ -4,7 +4,6 @@
 
 #include "ui/ozone/platform/mir/mir_connection_wrapper.h"
 
-#include <map>
 #include <mir_toolkit/mir_connection.h>
 
 #include "ui/ozone/platform/mir/mir_platform_window.h"
@@ -35,22 +34,8 @@ public:
     return connection_;
   }
 
-  MirPlatformWindow* GetWindow(gfx::AcceleratedWidget widget) {
-    auto it = window_map_.find(widget);
-    return it == window_map_.end() ? nullptr : it->second;
-  }
-
-  void AddWindow(gfx::AcceleratedWidget widget, MirPlatformWindow* window) {
-    window_map_[widget] = window;
-  }
-
-  void RemoveWindow(gfx::AcceleratedWidget widget) {
-    window_map_.erase(widget);
-  }
-
 private:
   MirConnection* connection_;
-  std::map<gfx::AcceleratedWidget, MirPlatformWindow*> window_map_;
 };
 
 //
@@ -72,16 +57,4 @@ MirConnection* MirConnectionWrapper::GetMirConnection() {
   return pimpl_->GetMirConnection();
 }
 
-MirPlatformWindow* MirConnectionWrapper::GetWindow(gfx::AcceleratedWidget widget) {
-  return pimpl_->GetWindow(widget);
-}
-
-void MirConnectionWrapper::AddWindow(gfx::AcceleratedWidget widget, MirPlatformWindow* window) {
-  pimpl_->AddWindow(widget, window);
-}
-
-void MirConnectionWrapper::RemoveWindow(gfx::AcceleratedWidget widget) {
-  pimpl_->RemoveWindow(widget);
-}
-
 } // namespace ui
diff --git a/ui/ozone/platform/mir/mir_connection_wrapper.h b/ui/ozone/platform/mir/mir_connection_wrapper.h
index e6ce590..4f41864 100644
--- a/ui/ozone/platform/mir/mir_connection_wrapper.h
+++ b/ui/ozone/platform/mir/mir_connection_wrapper.h
@@ -8,7 +8,6 @@
 #include <memory>
 
 #include "base/macros.h"
-#include "ui/gfx/native_widget_types.h"
 
 struct MirConnection;
 
@@ -25,10 +24,6 @@ public:
 
   MirConnection* GetMirConnection();
 
-  MirPlatformWindow* GetWindow(gfx::AcceleratedWidget widget);
-  void AddWindow(gfx::AcceleratedWidget widget, MirPlatformWindow* window);
-  void RemoveWindow(gfx::AcceleratedWidget widget);
-
 private:
   class Impl;
   std::unique_ptr<Impl> pimpl_;
diff --git a/ui/ozone/platform/mir/mir_platform_window.cc b/ui/ozone/platform/mir/mir_platform_window.cc
index 44f0582..5195491 100644
--- a/ui/ozone/platform/mir/mir_platform_window.cc
+++ b/ui/ozone/platform/mir/mir_platform_window.cc
@@ -4,17 +4,92 @@
 
 #include "ui/ozone/platform/mir/mir_platform_window.h"
 
+#include <mir_toolkit/mir_window.h>
+
 #include "base/logging.h"
+#include "ui/ozone/platform/mir/mir_connection_wrapper.h"
+#include "ui/ozone/platform/mir/mir_platform_window_manager.h"
+#include "ui/platform_window/platform_window_delegate.h"
 
 namespace ui {
 
-
-MirPlatformWindow::MirPlatformWindow() {
+//
+// Start Private Implementation
+//
+
+class MirPlatformWindow::Impl {
+public:
+  Impl(PlatformWindowDelegate* delegate,
+       MirConnectionWrapper* connection,
+       const gfx::Rect& bounds,
+       MirPlatformWindowManager* window_manager,
+       MirPlatformWindow* parent)
+    : parent_(parent),
+      delegate_(delegate),
+      connection_(connection),
+      window_manager_(window_manager),
+      window_(nullptr),
+      bounds_(bounds),
+      widget_(0) {
+  }
+
+  ~Impl() {
+    if (widget_)
+      window_manager_->RemoveWindow(widget_);
+    if (mir_window_is_valid(window_))
+      mir_window_release_sync(window_);
+  }
+
+  bool Initialize() {
+    auto connection =  connection_->GetMirConnection();
+
+    auto spec = mir_create_normal_window_spec(connection, 0, 0);
+    window_ = mir_create_window_sync(spec);
+    mir_window_spec_release(spec);
+
+    if (!mir_window_is_valid(window_)) {
+      LOG(ERROR) << "Failed to create mir window";
+      return false;
+    }
+
+    widget_ = window_manager_->NextAcceleratedWidget();
+    window_manager_->AddWindow(widget_, parent_);
+    delegate_->OnAcceleratedWidgetAvailable(widget_, 1.f);
+
+    return true;
+  }
+
+private:
+  MirPlatformWindow* parent_;
+
+  PlatformWindowDelegate* delegate_;
+  MirConnectionWrapper* connection_;
+  MirPlatformWindowManager* window_manager_;
+
+  MirWindow* window_;
+
+  gfx::Rect bounds_;
+  gfx::AcceleratedWidget widget_;
+};
+
+//
+// End Private Implementation
+//
+
+MirPlatformWindow::MirPlatformWindow(PlatformWindowDelegate* delegate,
+                                     MirConnectionWrapper* connection,
+                                     const gfx::Rect& bound,
+                                     MirPlatformWindowManager* window_manager)
+  : pimpl_(new Impl(delegate, connection, bound, window_manager, this)) {
 }
 
 MirPlatformWindow::~MirPlatformWindow() {
 }
 
+bool MirPlatformWindow::Initialize() {
+  return pimpl_->Initialize();
+}
+
 void MirPlatformWindow::Show() {
   NOTIMPLEMENTED();
 }
diff --git a/ui/ozone/platform/mir/mir_platform_window.h b/ui/ozone/platform/mir/mir_platform_window.h
index 5cd7487..3b94368 100644
--- a/ui/ozone/platform/mir/mir_platform_window.h
+++ b/ui/ozone/platform/mir/mir_platform_window.h
@@ -5,17 +5,28 @@
 #ifndef UI_OZONE_PLATFORM_MIR_MIR_PLATFORM_WINDOW_H_
 #define UI_OZONE_PLATFORM_MIR_MIR_PLATFORM_WINDOW_H_
 
+#include <memory>
+
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/platform_window/platform_window.h"
 
 namespace ui {
 
+class MirConnectionWrapper;
+class MirPlatformWindowManager;
+class PlatformWindowDelegate;
+
 class MirPlatformWindow : public PlatformWindow {
  public:
-  MirPlatformWindow();
+  MirPlatformWindow(PlatformWindowDelegate* delegate,
+                    MirConnectionWrapper* connection,
+                    const gfx::Rect& bounds,
+                    MirPlatformWindowManager* window_manager);
   ~MirPlatformWindow() override;
 
+  bool Initialize();
+
   void Show() override;
   void Hide() override;
   void Close() override;
@@ -40,6 +51,9 @@ class MirPlatformWindow : public PlatformWindow {
   PlatformImeController* GetPlatformImeController() override;
 
  private:
+  class Impl;
+  std::unique_ptr<Impl> pimpl_;
+
   DISALLOW_COPY_AND_ASSIGN(MirPlatformWindow);
 };
 
diff --git a/ui/ozone/platform/mir/mir_platform_window_manager.cc b/ui/ozone/platform/mir/mir_platform_window_manager.cc
new file mode 100644
index 0000000..884644a
--- /dev/null
+++ b/ui/ozone/platform/mir/mir_platform_window_manager.cc
@@ -0,0 +1,85 @@
+// 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_platform_window_manager.h"
+
+#include <map>
+#include <utility>
+
+#include "base/logging.h"
+#include "ui/ozone/platform/mir/mir_platform_window.h"
+
+namespace ui {
+
+//
+// Start private implementation
+//
+
+class MirPlatformWindowManager::Impl {
+public:
+  gfx::AcceleratedWidget NextAcceleratedWidget() {
+    // We're not using 0 since other code assumes that a 0 AcceleratedWidget is
+    // an invalid widget.
+    return ++last_allocated_widget_;
+  }
+
+  void AddWindow(gfx::AcceleratedWidget widget,
+                 MirPlatformWindow* window) {
+    auto result = window_map_.insert(std::make_pair(widget, window));
+    DCHECK(result.second) << "Window for " << widget << " already added.";
+  }
+
+  void RemoveWindow(gfx::AcceleratedWidget widget) {
+    auto it = window_map_.find(widget);
+    if (it != end(window_map_))
+      window_map_.erase(it);
+    else
+      NOTREACHED() << "Attempting to remove non-existing window " << widget;
+  }
+
+  MirPlatformWindow* GetWindow(gfx::AcceleratedWidget widget) {
+    auto it = window_map_.find(widget);
+    if (it != end(window_map_))
+      return it->second;
+
+    NOTREACHED() << "Attempting to get non-existing window " << widget;
+    return nullptr;
+  }
+
+private:
+  typedef std::map<gfx::AcceleratedWidget, MirPlatformWindow*> WidgetToWindowMap;
+
+  gfx::AcceleratedWidget last_allocated_widget_ = 0;
+  WidgetToWindowMap window_map_;
+};
+
+//
+// End private implementation
+//
+
+MirPlatformWindowManager::MirPlatformWindowManager()
+  : pimpl_(new Impl) {
+}
+
+MirPlatformWindowManager::~MirPlatformWindowManager() {
+}
+
+gfx::AcceleratedWidget MirPlatformWindowManager::NextAcceleratedWidget() {
+  return pimpl_->NextAcceleratedWidget();
+}
+
+void MirPlatformWindowManager::AddWindow(gfx::AcceleratedWidget widget,
+                                         MirPlatformWindow* window) {
+  pimpl_->AddWindow(widget, window);
+}
+
+void MirPlatformWindowManager::RemoveWindow(gfx::AcceleratedWidget widget) {
+  pimpl_->RemoveWindow(widget);
+}
+
+MirPlatformWindow* MirPlatformWindowManager::GetWindow(gfx::AcceleratedWidget widget) {
+  return pimpl_->GetWindow(widget);
+}
+
+}  // namespace ui
diff --git a/ui/ozone/platform/mir/mir_platform_window_manager.h b/ui/ozone/platform/mir/mir_platform_window_manager.h
new file mode 100644
index 0000000..3af5934
--- /dev/null
+++ b/ui/ozone/platform/mir/mir_platform_window_manager.h
@@ -0,0 +1,47 @@
+// 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_PLATFORM_WINDOW_MANAGER_H_
+#define UI_OZONE_PLATFORM_MIR_MIR_PLATFORM_WINDOW_MANAGER_H_
+
+#include <memory>
+
+#include "base/macros.h"
+#include "ui/gfx/native_widget_types.h"
+
+namespace ui {
+
+class MirPlatformWindow;
+
+// Responsible for keeping the mapping between the allocated widgets and
+// windows.
+class MirPlatformWindowManager {
+ public:
+  MirPlatformWindowManager();
+  ~MirPlatformWindowManager();
+
+  gfx::AcceleratedWidget NextAcceleratedWidget();
+
+  // Adds a window for |widget|. Note: |widget| should not be associated when
+  // calling this function.
+  void AddWindow(gfx::AcceleratedWidget widget, MirPlatformWindow* window);
+
+  // Removes the window association for |widget|. Note: |widget| must be
+  // associated with a window when calling this function.
+  void RemoveWindow(gfx::AcceleratedWidget widget);
+
+  // Returns the window associated with |widget|. Note: This function should
+  // only be called if a valid window has been associated.
+  MirPlatformWindow* GetWindow(gfx::AcceleratedWidget widget);
+
+ private:
+  class Impl;
+  std::unique_ptr<Impl> pimpl_;
+
+  DISALLOW_COPY_AND_ASSIGN(MirPlatformWindowManager);
+};
+
+}  // namespace ui
+
+#endif  // UI_OZONE_PLATFORM_MIR_MIR_PLATFORM_WINDOW_MANAGER_H_
diff --git a/ui/ozone/platform/mir/mir_platform_window_manager_unittest.cc b/ui/ozone/platform/mir/mir_platform_window_manager_unittest.cc
new file mode 100644
index 0000000..0caae34
--- /dev/null
+++ b/ui/ozone/platform/mir/mir_platform_window_manager_unittest.cc
@@ -0,0 +1,46 @@
+// 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 <memory>
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/ozone/platform/mir/mir_platform_window_manager.h"
+
+class MirPlatformWindowManagerTest : public testing::Test {
+ public:
+  MirPlatformWindowManagerTest() {
+  }
+
+  void SetUp() override {
+    wm_.reset(new ui::MirPlatformWindowManager);
+  }
+
+ protected:
+  std::unique_ptr<ui::MirPlatformWindowManager> wm_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MirPlatformWindowManagerTest);
+};
+
+TEST_F(MirPlatformWindowManagerTest, NextAcceleratedWidget) {
+  EXPECT_EQ(1, wm_->NextAcceleratedWidget());
+  EXPECT_EQ(2, wm_->NextAcceleratedWidget());
+  EXPECT_EQ(3, wm_->NextAcceleratedWidget());
+}
+
+TEST_F(MirPlatformWindowManagerTest, AddAndRemoveWindow) {
+  auto widget1 = wm_->NextAcceleratedWidget();
+  auto window1 = reinterpret_cast<ui::MirPlatformWindow*>(0x1234);
+  wm_->AddWindow(widget1, window1);
+
+  auto widget2 = wm_->NextAcceleratedWidget();
+  auto window2 = reinterpret_cast<ui::MirPlatformWindow*>(0x6789);
+  wm_->AddWindow(widget2, window2);
+
+  EXPECT_EQ(window1, wm_->GetWindow(widget1));
+  EXPECT_EQ(window2, wm_->GetWindow(widget2));
+
+  wm_->RemoveWindow(widget1);
+  EXPECT_DEATH(wm_->GetWindow(widget1), "");
+}
diff --git a/ui/ozone/platform/mir/ozone_platform_mir.cc b/ui/ozone/platform/mir/ozone_platform_mir.cc
index 3ce6d53..3157f55 100644
--- a/ui/ozone/platform/mir/ozone_platform_mir.cc
+++ b/ui/ozone/platform/mir/ozone_platform_mir.cc
@@ -10,6 +10,7 @@
 #include "ui/ozone/common/stub_overlay_manager.h"
 #include "ui/ozone/platform/mir/mir_connection_wrapper.h"
 #include "ui/ozone/platform/mir/mir_platform_window.h"
+#include "ui/ozone/platform/mir/mir_platform_window_manager.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"
@@ -59,7 +60,12 @@ class OzonePlatformMir : public OzonePlatform {
   std::unique_ptr<PlatformWindow> CreatePlatformWindow(
       PlatformWindowDelegate* delegate,
       const gfx::Rect& bounds) override {
-    NOTIMPLEMENTED();
+    auto window =
+        base::MakeUnique<MirPlatformWindow>(delegate, connection_.get(), bounds,
+          window_manager_.get());
+    if (!window->Initialize())
+      return nullptr;
+    return std::move(window);
     return nullptr;
   }
 
@@ -75,8 +81,11 @@ class OzonePlatformMir : public OzonePlatform {
 
   void InitializeUI(const InitParams& args) override {
     connection_.reset(new MirConnectionWrapper);
+
     if (!connection_->Initialize())
       LOG(FATAL) << "Failed to initialize Mir platform";
+
+    window_manager_.reset(new MirPlatformWindowManager);
   }
 
   void InitializeGPU() override {
@@ -90,6 +99,7 @@ class OzonePlatformMir : public OzonePlatform {
 
  private:
   std::unique_ptr<MirConnectionWrapper> connection_;
+  std::unique_ptr<MirPlatformWindowManager> window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(OzonePlatformMir);
 };