jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make platform policy a weak_ptr inside our window managers to break cycle reference

Browse source
This commit is contained in:
Simon Fels 2017-05-12 08:35:10 +02:00
commit bf243a33e8
4 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/anbox/wm/multi_window_manager.cpp
View file

@ -25,7 +25,7 @@
namespace anbox { namespace anbox {
namespace wm { namespace wm {
MultiWindowManager::MultiWindowManager(const std::shared_ptr<platform::Policy> &policy, MultiWindowManager::MultiWindowManager(const std::weak_ptr<platform::Policy> &policy,
const std::shared_ptr<bridge::AndroidApiStub> &android_api_stub, const std::shared_ptr<bridge::AndroidApiStub> &android_api_stub,
const std::shared_ptr<application::Database> &app_db) const std::shared_ptr<application::Database> &app_db)
: platform_policy_(policy), android_api_stub_(android_api_stub), app_db_(app_db) {} : platform_policy_(policy), android_api_stub_(android_api_stub), app_db_(app_db) {}
@ -67,9 +67,16 @@ void MultiWindowManager::apply_window_state_update(const WindowState::List &upda
if (app.valid()) if (app.valid())
title = app.name; title = app.name;
auto platform_window = platform_policy_->create_window(window.task(), window.frame(), title); if (auto p = platform_policy_.lock()) {
platform_window->attach(); auto w = p->create_window(window.task(), window.frame(), title);
windows_.insert({window.task(), platform_window}); if (w) {
w->attach();
windows_.insert({window.task(), w});
} else {
// FIXME can we call this here safely or do we need to schedule the removal?
remove_task(window.task());
}
}
} }
// Send updates we collected per task down to the corresponding window // Send updates we collected per task down to the corresponding window

4
src/anbox/wm/multi_window_manager.h
View file

@ -37,7 +37,7 @@ class Policy;
namespace wm { namespace wm {
class MultiWindowManager : public Manager { class MultiWindowManager : public Manager {
public: public:
MultiWindowManager(const std::shared_ptr<platform::Policy> &policy, MultiWindowManager(const std::weak_ptr<platform::Policy> &policy,
const std::shared_ptr<bridge::AndroidApiStub> &android_api_stub, const std::shared_ptr<bridge::AndroidApiStub> &android_api_stub,
const std::shared_ptr<application::Database> &app_db); const std::shared_ptr<application::Database> &app_db);
~MultiWindowManager(); ~MultiWindowManager();
@ -53,7 +53,7 @@ class MultiWindowManager : public Manager {
private: private:
std::mutex mutex_; std::mutex mutex_;
std::shared_ptr<platform::Policy> platform_policy_; std::weak_ptr<platform::Policy> platform_policy_;
std::shared_ptr<bridge::AndroidApiStub> android_api_stub_; std::shared_ptr<bridge::AndroidApiStub> android_api_stub_;
std::shared_ptr<application::Database> app_db_; std::shared_ptr<application::Database> app_db_;
std::map<Task::Id, std::shared_ptr<Window>> windows_; std::map<Task::Id, std::shared_ptr<Window>> windows_;

12
src/anbox/wm/single_window_manager.cpp
View file

@ -26,7 +26,7 @@
namespace anbox { namespace anbox {
namespace wm { namespace wm {
SingleWindowManager::SingleWindowManager(const std::shared_ptr<platform::Policy> &policy, SingleWindowManager::SingleWindowManager(const std::weak_ptr<platform::Policy> &policy,
const graphics::Rect &window_size, const graphics::Rect &window_size,
const std::shared_ptr<application::Database> &app_db) const std::shared_ptr<application::Database> &app_db)
: platform_policy_(policy), window_size_(window_size), app_db_(app_db) {} : platform_policy_(policy), window_size_(window_size), app_db_(app_db) {}
@ -34,9 +34,13 @@ SingleWindowManager::SingleWindowManager(const std::shared_ptr<platform::Policy>
SingleWindowManager::~SingleWindowManager() {} SingleWindowManager::~SingleWindowManager() {}
void SingleWindowManager::setup() { void SingleWindowManager::setup() {
window_ = platform_policy_->create_window(0, window_size_, "Anbox - Android in a Box"); if (auto p = platform_policy_.lock()) {
if (!window_->attach()) window_ = p->create_window(0, window_size_, "Anbox - Android in a Box");
WARNING("Failed to attach window to renderer"); if (!window_->attach())
WARNING("Failed to attach window to renderer");
} else {
throw std::runtime_error("Can't create window as we don't have a platform abstraction");
}
} }
void SingleWindowManager::apply_window_state_update(const WindowState::List &updated, const WindowState::List &removed) { void SingleWindowManager::apply_window_state_update(const WindowState::List &updated, const WindowState::List &removed) {

4
src/anbox/wm/single_window_manager.h
View file

@ -35,7 +35,7 @@ namespace wm {
class Window; class Window;
class SingleWindowManager : public Manager { class SingleWindowManager : public Manager {
public: public:
SingleWindowManager(const std::shared_ptr<platform::Policy> &policy, SingleWindowManager(const std::weak_ptr<platform::Policy> &policy,
const graphics::Rect &window_size, const graphics::Rect &window_size,
const std::shared_ptr<application::Database> &app_db); const std::shared_ptr<application::Database> &app_db);
~SingleWindowManager(); ~SingleWindowManager();
@ -52,7 +52,7 @@ class SingleWindowManager : public Manager {
void remove_task(const Task::Id &task) override; void remove_task(const Task::Id &task) override;
private: private:
std::shared_ptr<platform::Policy> platform_policy_; std::weak_ptr<platform::Policy> platform_policy_;
graphics::Rect window_size_; graphics::Rect window_size_;
std::shared_ptr<application::Database> app_db_; std::shared_ptr<application::Database> app_db_;
std::shared_ptr<Window> window_; std::shared_ptr<Window> window_;