Add routing id and notification type to accessibility logging.

webkit/glue/webaccessibility.cc

 // Copyright (c) 2011 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 "webkit/glue/webaccessibility.h"
 
 #include <set>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityCache.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityObject.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityRole.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAttribute.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocumentType.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNamedNodeMap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 
+#ifndef NDEBUG
+#include "content/common/view_messages.h"
+#endif
+

[brettw, 2011/09/16 04:52:23]

Extra blank line here.

[David Tseng, 2011/09/19 16:02:45]

Done.

+
 using base::DoubleToString;
 using base::IntToString;
 using WebKit::WebAccessibilityCache;
 using WebKit::WebAccessibilityRole;
 using WebKit::WebAccessibilityObject;
 
 namespace {
 
 std::string IntVectorToString(const std::vector<int>& items) {
   std::string str;
@@ skipping 289 matching lines @@
 WebAccessibility::WebAccessibility(const WebKit::WebAccessibilityObject& src,
                                    WebKit::WebAccessibilityCache* cache,
                                    bool include_children) {
   Init(src, cache, include_children);
 }
 
 WebAccessibility::~WebAccessibility() {
 }
 
 #ifndef NDEBUG
-std::string WebAccessibility::DebugString(bool recursive) {
+std::string WebAccessibility::DebugString(bool recursive,
+    int render_routing_id,

[brettw, 2011/09/16 04:52:23]

These should be aligned with the "bool" on the previous line.

[David Tseng, 2011/09/19 16:02:45]

Done.

+    int notification) {
   std::string result;
   static int indent = 0;
 
+  if (render_routing_id != 0) {
+    ViewHostMsg_AccEvent::Value notification_type =
+        static_cast<ViewHostMsg_AccEvent::Value>(notification);
+    result+= "routing id: ";

[brettw, 2011/09/16 04:52:23]

There should be a space before the "+" on each of these lines.

[David Tseng, 2011/09/19 16:02:45]

Done; had done this to minimize spacing (bad style).

+    result+= IntToString(render_routing_id);
+    result+= " notification: ";
+
+    switch (notification_type) {
+      case ViewHostMsg_AccEvent::ACTIVE_DESCENDANT_CHANGED:
+        result+= "active descendant changed";
+        break;
+      case ViewHostMsg_AccEvent::ALERT:
+        result+= "alert";
+        break;
+      case ViewHostMsg_AccEvent::CHECK_STATE_CHANGED:
+        result+= "checked state changed";
+        break;
+      case ViewHostMsg_AccEvent::CHILDREN_CHANGED:
+        result+= "children changed";
+        break;
+      case ViewHostMsg_AccEvent::FOCUS_CHANGED:
+        result+= "focus changed";
+        break;
+      case ViewHostMsg_AccEvent::LAYOUT_COMPLETE:
+        result+= "layout complete";
+        break;
+      case ViewHostMsg_AccEvent::LIVE_REGION_CHANGED:
+        result+= "live region changed";
+        break;
+      case ViewHostMsg_AccEvent::LOAD_COMPLETE:
+        result+= "load complete";
+        break;
+      case ViewHostMsg_AccEvent::MENU_LIST_VALUE_CHANGED:
+        result+= "menu list changed";
+        break;
+      case ViewHostMsg_AccEvent::OBJECT_SHOW:
+        result+= "object show";
+        break;
+      case ViewHostMsg_AccEvent::OBJECT_HIDE:
+        result+= "object hide";
+        break;
+      case ViewHostMsg_AccEvent::ROW_COUNT_CHANGED:
+        result+= "row count changed";
+        break;
+      case ViewHostMsg_AccEvent::ROW_COLLAPSED:
+        result+= "row collapsed";
+        break;
+      case ViewHostMsg_AccEvent::ROW_EXPANDED:
+        result+= "row expanded";
+        break;
+      case ViewHostMsg_AccEvent::SCROLLED_TO_ANCHOR:
+        result+= "scrolled to anchor";
+        break;
+      case ViewHostMsg_AccEvent::SELECTED_CHILDREN_CHANGED:
+        result+= "selected children changed";
+        break;
+      case ViewHostMsg_AccEvent::SELECTED_TEXT_CHANGED:
+        result+= "selected text changed";
+        break;
+      case ViewHostMsg_AccEvent::TEXT_INSERTED:
+        result+= "text inserted";
+        break;
+      case ViewHostMsg_AccEvent::TEXT_REMOVED:
+        result+= "text removed";
+        break;
+      case ViewHostMsg_AccEvent::VALUE_CHANGED:
+        result+= "value changed";
+        break;
+      default:
+        NOTREACHED();
+    }
+  }
+
+  result += "\n";
   for (int i = 0; i < indent; ++i)
     result += "  ";
 
   result += "id=" + IntToString(id);
 
   switch (role) {
     case ROLE_ALERT: result += " ALERT"; break;
     case ROLE_ALERT_DIALOG: result += " ALERT_DIALOG"; break;
     case ROLE_ANNOTATION: result += " ANNOTATION"; break;
     case ROLE_APPLICATION: result += " APPLICATION"; break;
@@ skipping 316 matching lines @@
   if (!line_breaks.empty())
     result += " line_breaks=" + IntVectorToString(line_breaks);
 
   if (!cell_ids.empty())
     result += " cell_ids=" + IntVectorToString(cell_ids);
 
   if (recursive) {
     result += "\n";
     ++indent;
     for (size_t i = 0; i < children.size(); ++i)
-      result += children[i].DebugString(true);
+      result += children[i].DebugString(true, 0, 0);
     --indent;
   }
 
   return result;
 }
 #endif  // ifndef NDEBUG
 
 void WebAccessibility::Init(const WebKit::WebAccessibilityObject& src,
                             WebKit::WebAccessibilityCache* cache,
                             bool include_children) {
@@ skipping 239 matching lines @@
 bool WebAccessibility::IsParentUnignoredOf(
     const WebKit::WebAccessibilityObject& ancestor,
     const WebKit::WebAccessibilityObject& child) {
   WebKit::WebAccessibilityObject parent = child.parentObject();
   while (!parent.isNull() && parent.accessibilityIsIgnored())
     parent = parent.parentObject();
   return parent.equals(ancestor);
 }
 
 }  // namespace webkit_glue