firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nukes ViewManager arg from ViewManagerDelegate::OnEmbed

Browse Source 
It can be obtained from the supplied view, so no reason to include in
the arguments.

R=ben@chromium.org, esprehn@chromium.org

Review URL: https://codereview.chromium.org/815003002
This commit is contained in:
Scott Violet 2014-12-18 14:35:42 -08:00
parent 798ee80480
commit 23cd16cb59
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/src/flutter/tools/debugger/debugger.cc
View File

@ -11,7 +11,6 @@ namespace debugger {
SkyDebugger::SkyDebugger() SkyDebugger::SkyDebugger()
: window_manager_app_(new window_manager::WindowManagerApp(this, nullptr)), : window_manager_app_(new window_manager::WindowManagerApp(this, nullptr)),
view_manager_(nullptr),
root_(nullptr), root_(nullptr),
content_(nullptr), content_(nullptr),
navigator_host_factory_(this), navigator_host_factory_(this),
@ -45,18 +44,15 @@ bool SkyDebugger::ConfigureOutgoingConnection(
} }
void SkyDebugger::OnEmbed( void SkyDebugger::OnEmbed(
mojo::ViewManager* view_manager,
mojo::View* root, mojo::View* root,
mojo::ServiceProviderImpl* exported_services, mojo::ServiceProviderImpl* exported_services,
scoped_ptr<mojo::ServiceProvider> imported_services) { scoped_ptr<mojo::ServiceProvider> imported_services) {
view_manager_ = view_manager;
root_ = root; root_ = root;
root_->AddObserver(this); root_->AddObserver(this);
window_manager_app_->SetViewportSize(gfx::Size(320, 640)); window_manager_app_->SetViewportSize(gfx::Size(320, 640));
content_ = mojo::View::Create(view_manager_); content_ = mojo::View::Create(root->view_manager());
content_->SetBounds(root_->bounds()); content_->SetBounds(root_->bounds());
root_->AddChild(content_); root_->AddChild(content_);
content_->SetVisible(true); content_->SetVisible(true);
@ -69,7 +65,6 @@ void SkyDebugger::OnEmbed(
} }
void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) { void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) {
view_manager_ = nullptr;
root_ = nullptr; root_ = nullptr;
} }

4
engine/src/flutter/tools/debugger/debugger.h
View File

@ -46,8 +46,7 @@ class SkyDebugger : public mojo::ApplicationDelegate,
mojo::ApplicationConnection* connection) override; mojo::ApplicationConnection* connection) override;
// Overridden from mojo::ViewManagerDelegate: // Overridden from mojo::ViewManagerDelegate:
void OnEmbed(mojo::ViewManager* view_manager, void OnEmbed(mojo::View* root,
mojo::View* root,
mojo::ServiceProviderImpl* exported_services, mojo::ServiceProviderImpl* exported_services,
scoped_ptr<mojo::ServiceProvider> imported_services) override; scoped_ptr<mojo::ServiceProvider> imported_services) override;
void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override; void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
@ -64,7 +63,6 @@ class SkyDebugger : public mojo::ApplicationDelegate,
scoped_ptr<window_manager::WindowManagerApp> window_manager_app_; scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
mojo::ViewManager* view_manager_;
mojo::View* root_; mojo::View* root_;
mojo::View* content_; mojo::View* content_;
std::string pending_url_; std::string pending_url_;

7
engine/src/flutter/tools/tester/tester.cc
View File

@ -61,7 +61,6 @@ class SkyTester : public mojo::ApplicationDelegate,
public: public:
SkyTester() SkyTester()
: window_manager_app_(new window_manager::WindowManagerApp(this, this)), : window_manager_app_(new window_manager::WindowManagerApp(this, this)),
view_manager_(NULL),
root_(NULL), root_(NULL),
content_(NULL), content_(NULL),
weak_ptr_factory_(this) {} weak_ptr_factory_(this) {}
@ -85,15 +84,13 @@ class SkyTester : public mojo::ApplicationDelegate,
// Overridden from mojo::ViewManagerDelegate: // Overridden from mojo::ViewManagerDelegate:
virtual void OnEmbed( virtual void OnEmbed(
mojo::ViewManager* view_manager,
mojo::View* root, mojo::View* root,
mojo::ServiceProviderImpl* exported_services, mojo::ServiceProviderImpl* exported_services,
scoped_ptr<mojo::ServiceProvider> remote_service_provider) override { scoped_ptr<mojo::ServiceProvider> remote_service_provider) override {
view_manager_ = view_manager;
root_ = root; root_ = root;
root_->AddObserver(this); root_->AddObserver(this);
content_ = mojo::View::Create(view_manager_); content_ = mojo::View::Create(root->view_manager());
content_->SetBounds(root_->bounds()); content_->SetBounds(root_->bounds());
root_->AddChild(content_); root_->AddChild(content_);
content_->SetVisible(true); content_->SetVisible(true);
@ -111,7 +108,6 @@ class SkyTester : public mojo::ApplicationDelegate,
virtual void OnViewManagerDisconnected( virtual void OnViewManagerDisconnected(
mojo::ViewManager* view_manager) override { mojo::ViewManager* view_manager) override {
view_manager_ = NULL;
root_ = NULL; root_ = NULL;
} }
@ -159,7 +155,6 @@ class SkyTester : public mojo::ApplicationDelegate,
std::string url_from_args_; std::string url_from_args_;
mojo::ViewManager* view_manager_;
mojo::View* root_; mojo::View* root_;
mojo::View* content_; mojo::View* content_;