Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1637)

Unified Diff: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc

Issue 621903004: Adds View::visible() and IsDrawn (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
index a7baa743658bbe4c78c595ac0f6e824871f35d3f..19955b2991e5eaea6476617ff1791e98297e9647 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc
@@ -31,16 +31,17 @@ Id MakeTransportId(ConnectionSpecificId connection_id,
// Helper called to construct a local view object from transport data.
View* AddViewToViewManager(ViewManagerClientImpl* client,
View* parent,
- Id view_id,
- const gfx::Rect& bounds) {
+ const ViewDataPtr& view_data) {
// We don't use the ctor that takes a ViewManager here, since it will call
// back to the service and attempt to create a new view.
View* view = ViewPrivate::LocalCreate();
ViewPrivate private_view(view);
private_view.set_view_manager(client);
- private_view.set_id(view_id);
+ private_view.set_id(view_data->view_id);
+ private_view.set_visible(view_data->visible);
+ private_view.set_drawn(view_data->drawn);
client->AddView(view);
- private_view.LocalSetBounds(gfx::Rect(), bounds);
+ private_view.LocalSetBounds(gfx::Rect(), view_data->bounds.To<gfx::Rect>());
if (parent)
ViewPrivate(parent).LocalAddChild(view);
return view;
@@ -62,10 +63,7 @@ View* BuildViewTree(ViewManagerClientImpl* client,
parents.pop_back();
}
View* view = AddViewToViewManager(
- client,
- !parents.empty() ? parents.back() : NULL,
- views[i]->view_id,
- views[i]->bounds.To<gfx::Rect>());
+ client, !parents.empty() ? parents.back() : NULL, views[i]);
if (!last_view)
root = view;
last_view = view;
@@ -276,8 +274,7 @@ void ViewManagerClientImpl::OnEmbed(
// A new root must not already exist as a root or be contained by an existing
// hierarchy visible to this view manager.
- View* root = AddViewToViewManager(this, NULL, root_data->view_id,
- root_data->bounds.To<gfx::Rect>());
+ View* root = AddViewToViewManager(this, NULL, root_data);
roots_.push_back(root);
root->AddObserver(new RootObserver(root));
@@ -332,13 +329,18 @@ void ViewManagerClientImpl::OnViewDeleted(Id view_id) {
}
void ViewManagerClientImpl::OnViewVisibilityChanged(Id view_id, bool visible) {
- // TODO(sky): implement me.
- NOTIMPLEMENTED();
+ // TODO(sky): there is a race condition here. If this client and another
+ // client change the visibility at the same time the wrong value may be set.
+ // Deal with this some how.
+ View* view = GetViewById(view_id);
+ if (view)
+ view->SetVisible(visible);
}
void ViewManagerClientImpl::OnViewDrawnStateChanged(Id view_id, bool drawn) {
- // TODO(sky): implement me.
- NOTIMPLEMENTED();
+ View* view = GetViewById(view_id);
+ if (view)
+ ViewPrivate(view).LocalSetDrawn(drawn);
}
void ViewManagerClientImpl::OnViewInputEvent(
« no previous file with comments | « mojo/services/public/cpp/view_manager/lib/view.cc ('k') | mojo/services/public/cpp/view_manager/lib/view_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698