Reorder

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"
 #include "mojo/services/public/cpp/view_manager/util.h"
 
 namespace mojo {
 namespace view_manager {
 namespace service {
 
 std::string NodeIdToString(Id id) {
   return (id == 0) ? "null" :
       base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
 namespace {
 
 std::string RectToString(const gfx::Rect& rect) {
   return base::StringPrintf("%d,%d %dx%d", rect.x(), rect.y(), rect.width(),
                             rect.height());
 }
 
+std::string DirectionToString(OrderDirection direction) {
+  return direction == ORDER_ABOVE ? "above" : "below";
+}
+
 std::string ChangeToDescription1(const Change& change) {
   switch (change.type) {
     case CHANGE_TYPE_CONNECTION_ESTABLISHED:
       return base::StringPrintf("OnConnectionEstablished creator=%s",
                                 change.creator_url.data());
 
     case CHANGE_TYPE_ROOTS_ADDED:
       return "OnRootsAdded";
 
     case CHANGE_TYPE_SERVER_CHANGE_ID_ADVANCED:
       return base::StringPrintf(
           "ServerChangeIdAdvanced %d", static_cast<int>(change.change_id));
 
 
     case CHANGE_TYPE_NODE_BOUNDS_CHANGED:
       return base::StringPrintf(
           "BoundsChanged node=%s old_bounds=%s new_bounds=%s",
           NodeIdToString(change.node_id).c_str(),
           RectToString(change.bounds).c_str(),
           RectToString(change.bounds2).c_str());
 
     case CHANGE_TYPE_NODE_HIERARCHY_CHANGED:
       return base::StringPrintf(
             "HierarchyChanged change_id=%d node=%s new_parent=%s old_parent=%s",
             static_cast<int>(change.change_id),
             NodeIdToString(change.node_id).c_str(),
             NodeIdToString(change.node_id2).c_str(),
             NodeIdToString(change.node_id3).c_str());
 
+    case CHANGE_TYPE_NODE_REORDERED:
+      return base::StringPrintf(
+          "Reordered change_id=%d node=%s relative=%s direction=%s",
+          static_cast<int>(change.change_id),
+          NodeIdToString(change.node_id).c_str(),
+          NodeIdToString(change.node_id2).c_str(),
+          DirectionToString(change.direction).c_str());
+
     case CHANGE_TYPE_NODE_DELETED:
       return base::StringPrintf("NodeDeleted change_id=%d node=%s",
                                 static_cast<int>(change.change_id),
                                 NodeIdToString(change.node_id).c_str());
 
     case CHANGE_TYPE_VIEW_DELETED:
       return base::StringPrintf("ViewDeleted view=%s",
                                 NodeIdToString(change.view_id).c_str());
 
     case CHANGE_TYPE_VIEW_REPLACED:
@@ skipping 44 matching lines @@
 
 Change::Change()
     : type(CHANGE_TYPE_CONNECTION_ESTABLISHED),
       connection_id(0),
       change_id(0),
       node_id(0),
       node_id2(0),
       node_id3(0),
       view_id(0),
       view_id2(0),
-      event_action(0) {}
+      event_action(0),
+      direction(ORDER_ABOVE) {}
 
 Change::~Change() {
 }
 
 TestChangeTracker::TestChangeTracker()
     : delegate_(NULL) {
 }
 
 TestChangeTracker::~TestChangeTracker() {
 }
@@ skipping 45 matching lines @@
   Change change;
   change.type = CHANGE_TYPE_NODE_HIERARCHY_CHANGED;
   change.node_id = node_id;
   change.node_id2 = new_parent_id;
   change.node_id3 = old_parent_id;
   change.change_id = server_change_id;
   INodesToTestNodes(nodes, &change.nodes);
   AddChange(change);
 }
 
+void TestChangeTracker::OnNodeReordered(Id node_id,
+                                        Id relative_node_id,
+                                        OrderDirection direction,
+                                        Id server_change_id) {
+  Change change;
+  change.type = CHANGE_TYPE_NODE_REORDERED;
+  change.node_id = node_id;
+  change.node_id2 = relative_node_id;
+  change.direction = direction;
+  change.change_id = server_change_id;
+  AddChange(change);
+}
+
 void TestChangeTracker::OnNodeDeleted(Id node_id, Id server_change_id) {
   Change change;
   change.type = CHANGE_TYPE_NODE_DELETED;
   change.node_id = node_id;
   change.change_id = server_change_id;
   AddChange(change);
 }
 
 void TestChangeTracker::OnViewDeleted(Id view_id) {
   Change change;
@@ skipping 29 matching lines @@
 std::string TestNode::ToString() const {
   return base::StringPrintf("node=%s parent=%s view=%s",
                             NodeIdToString(node_id).c_str(),
                             NodeIdToString(parent_id).c_str(),
                             NodeIdToString(view_id).c_str());
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo