Improve some debug tools for mus.

services/ui/ws/server_window.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 "services/ui/ws/server_window.h"
 
 #include <inttypes.h>
 #include <stddef.h>
 
 #include "base/strings/stringprintf.h"
@@ skipping 363 matching lines @@
 }
 
 void ServerWindow::SetUnderlayOffset(const gfx::Vector2d& offset) {
   if (offset == underlay_offset_)
     return;
 
   underlay_offset_ = offset;
   delegate_->OnScheduleWindowPaint(this);
 }
 
-#if !defined(NDEBUG)
+#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 std::string ServerWindow::GetDebugWindowHierarchy() const {
   std::string result;
   BuildDebugInfo(std::string(), &result);
   return result;
 }
 
+std::string ServerWindow::GetDebugWindowInfo() const {
+  std::string name = GetName();
+  return base::StringPrintf(
+      "id=%u:%u visible=%s bounds=%d,%d %dx%d %s", id_.client_id, id_.window_id,

[sky, 2016/08/17 19:01:05]

id_.ToString() ?

[kylechar, 2016/08/17 19:10:12]

Done.

+      visible_ ? "true" : "false", bounds_.x(), bounds_.y(), bounds_.width(),
+      bounds_.height(), !name.empty() ? name.c_str() : "(no name)");
+}
+
 void ServerWindow::BuildDebugInfo(const std::string& depth,
                                   std::string* result) const {
-  std::string name = GetName();
-  *result += base::StringPrintf(
-      "%sid=%d,%d visible=%s bounds=%d,%d %dx%d %s\n", depth.c_str(),
-      static_cast<int>(id_.client_id), static_cast<int>(id_.window_id),
-      visible_ ? "true" : "false", bounds_.x(), bounds_.y(), bounds_.width(),
-      bounds_.height(), !name.empty() ? name.c_str() : "(no name)");
+  *result +=
+      base::StringPrintf("%s%s\n", depth.c_str(), GetDebugWindowInfo().c_str());
   for (const ServerWindow* child : children_)
     child->BuildDebugInfo(depth + "  ", result);
 }
 #endif
 
 void ServerWindow::RemoveImpl(ServerWindow* window) {
   window->parent_ = nullptr;
   children_.erase(std::find(children_.begin(), children_.end(), window));
 }
 
@@ skipping 40 matching lines @@
 }
 
 // static
 ServerWindow** ServerWindow::GetStackingTarget(ServerWindow* window) {
   return &window->stacking_target_;
 }
 
 }  // namespace ws
 
 }  // namespace ui