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 "third_party/WebKit/Source/WebKit/chromium/public/WebAccessibilityNotification.h"
+#endif
+
 using base::DoubleToString;
 using base::IntToString;
 using WebKit::WebAccessibilityCache;
 using WebKit::WebAccessibilityRole;
 using WebKit::WebAccessibilityObject;
 
+#ifndef NDEBUG
+using WebKit::WebAccessibilityNotification;
+#endif
+
 namespace {
 
 std::string IntVectorToString(const std::vector<int>& items) {
   std::string str;
   for (size_t i = 0; i < items.size(); ++i) {
     if (i > 0)
       str += ",";
     str += IntToString(items[i]);
   }
   return str;
@@ skipping 283 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,
+                                          int notification) {
   std::string result;
   static int indent = 0;
 
+  if (render_routing_id != 0) {
+    WebKit::WebAccessibilityNotification notification_type =
+        static_cast<WebKit::WebAccessibilityNotification>(notification);
+    result += "routing id=";
+    result += IntToString(render_routing_id);
+    result += " notification=";
+
+    switch (notification_type) {
+      case WebKit::WebAccessibilityNotificationActiveDescendantChanged:
+        result += "active descendant changed";
+        break;
+      case WebKit::WebAccessibilityNotificationCheckedStateChanged:
+        result += "check state changed";
+        break;
+      case WebKit::WebAccessibilityNotificationChildrenChanged:
+        result += "children changed";
+        break;
+      case WebKit::WebAccessibilityNotificationFocusedUIElementChanged:
+        result += "focus changed";
+        break;
+      case WebKit::WebAccessibilityNotificationLayoutComplete:
+        result += "layout complete";
+        break;
+      case WebKit::WebAccessibilityNotificationLiveRegionChanged:
+        result += "live region changed";
+        break;
+      case WebKit::WebAccessibilityNotificationLoadComplete:
+        result += "load complete";
+        break;
+      case WebKit::WebAccessibilityNotificationMenuListValueChanged:
+        result += "menu list changed";
+        break;
+      case WebKit::WebAccessibilityNotificationRowCountChanged:
+        result += "row count changed";
+        break;
+      case WebKit::WebAccessibilityNotificationRowCollapsed:
+        result += "row collapsed";
+        break;
+      case WebKit::WebAccessibilityNotificationRowExpanded:
+        result += "row expanded";
+        break;
+      case WebKit::WebAccessibilityNotificationScrolledToAnchor:
+        result += "scrolled to anchor";
+        break;
+      case WebKit::WebAccessibilityNotificationSelectedChildrenChanged:
+        result += "selected children changed";
+        break;
+      case WebKit::WebAccessibilityNotificationSelectedTextChanged:
+        result += "selected text changed";
+        break;
+      case WebKit::WebAccessibilityNotificationValueChanged:
+        result += "value changed";
+        break;
+      case WebKit::WebAccessibilityNotificationInvalid:
+        result += "invalid notification";
+        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