Changes view manager to report visibility and drawn state

mojo/services/view_manager/test_change_tracker.cc

 // Copyright 2014 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 "mojo/services/view_manager/test_change_tracker.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
@@ skipping 41 matching lines @@
     case CHANGE_TYPE_NODE_REORDERED:
       return base::StringPrintf("Reordered view=%s relative=%s direction=%s",
                                 ViewIdToString(change.view_id).c_str(),
                                 ViewIdToString(change.view_id2).c_str(),
                                 DirectionToString(change.direction).c_str());
 
     case CHANGE_TYPE_NODE_DELETED:
       return base::StringPrintf("ViewDeleted view=%s",
                                 ViewIdToString(change.view_id).c_str());
 
+    case CHANGE_TYPE_NODE_VISIBILITY_CHANGED:
+      return base::StringPrintf("VisibilityChanged view=%s visible=%s",
+                                ViewIdToString(change.view_id).c_str(),
+                                change.bool_value ? "true" : "false");
+
+    case CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED:
+      return base::StringPrintf("DrawnStateChanged view=%s drawn=%s",
+                                ViewIdToString(change.view_id).c_str(),
+                                change.bool_value ? "true" : "false");
+
     case CHANGE_TYPE_INPUT_EVENT:
       return base::StringPrintf("InputEvent view=%s event_action=%d",
                                 ViewIdToString(change.view_id).c_str(),
                                 change.event_action);
+
     case CHANGE_TYPE_DELEGATE_EMBED:
       return base::StringPrintf("DelegateEmbed url=%s",
                                 change.embed_url.data());
   }
   return std::string();
 }
 
 }  // namespace
 
 std::vector<std::string> ChangesToDescription1(
@@ skipping 10 matching lines @@
   std::vector<std::string> view_strings(changes[0].views.size());
   for (size_t i = 0; i < changes[0].views.size(); ++i)
     view_strings[i] = "[" + changes[0].views[i].ToString() + "]";
   return JoinString(view_strings, ',');
 }
 
 TestView ViewDataToTestView(const ViewDataPtr& data) {
   TestView view;
   view.parent_id = data->parent_id;
   view.view_id = data->view_id;
+  view.visible = data->visible;
+  view.drawn = data->drawn;
   return view;
 }
 
 void ViewDatasToTestViews(const Array<ViewDataPtr>& data,
                           std::vector<TestView>* test_views) {
   for (size_t i = 0; i < data.size(); ++i)
     test_views->push_back(ViewDataToTestView(data[i]));
 }
 
 Change::Change()
     : type(CHANGE_TYPE_EMBED),
       connection_id(0),
       view_id(0),
       view_id2(0),
       view_id3(0),
       event_action(0),
-      direction(ORDER_DIRECTION_ABOVE) {
+      direction(ORDER_DIRECTION_ABOVE),
+      bool_value(false) {
 }
 
 Change::~Change() {
 }
 
 TestChangeTracker::TestChangeTracker()
     : delegate_(NULL) {
 }
 
 TestChangeTracker::~TestChangeTracker() {
@@ skipping 45 matching lines @@
   AddChange(change);
 }
 
 void TestChangeTracker::OnViewDeleted(Id view_id) {
   Change change;
   change.type = CHANGE_TYPE_NODE_DELETED;
   change.view_id = view_id;
   AddChange(change);
 }
 
+void TestChangeTracker::OnViewVisibilityChanged(Id view_id, bool visible) {
+  Change change;
+  change.type = CHANGE_TYPE_NODE_VISIBILITY_CHANGED;
+  change.view_id = view_id;
+  change.bool_value = visible;
+  AddChange(change);
+}
+
+void TestChangeTracker::OnViewDrawnStateChanged(Id view_id, bool drawn) {
+  Change change;
+  change.type = CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED;
+  change.view_id = view_id;
+  change.bool_value = drawn;
+  AddChange(change);
+}
+
 void TestChangeTracker::OnViewInputEvent(Id view_id, EventPtr event) {
   Change change;
   change.type = CHANGE_TYPE_INPUT_EVENT;
   change.view_id = view_id;
   change.event_action = event->action;
   AddChange(change);
 }
 
 void TestChangeTracker::DelegateEmbed(const String& url) {
   Change change;
   change.type = CHANGE_TYPE_DELEGATE_EMBED;
   change.embed_url = url;
   AddChange(change);
 }
 
 void TestChangeTracker::AddChange(const Change& change) {
   changes_.push_back(change);
   if (delegate_)
     delegate_->OnChangeAdded();
 }
 
 std::string TestView::ToString() const {
   return base::StringPrintf("view=%s parent=%s",
                             ViewIdToString(view_id).c_str(),
                             ViewIdToString(parent_id).c_str());
 }
 
+std::string TestView::ToString2() const {
+  return base::StringPrintf("view=%s parent=%s visible=%s drawn=%s",
+                            ViewIdToString(view_id).c_str(),
+                            ViewIdToString(parent_id).c_str(),
+                            visible ? "true" : "false",
+                            drawn ? "true" : "false");
+}
+
 }  // namespace service
 }  // namespace mojo