Improve accessible name calculation on Windows.

content/browser/accessibility/dump_accessibility_tree_helper.cc

 // Copyright (c) 2012 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 "content/browser/accessibility/dump_accessibility_tree_helper.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 
 namespace {
 const int kIndentSpaces = 4;
+const char* kSkipString = "@NO_DUMP";
 }
 
 DumpAccessibilityTreeHelper::DumpAccessibilityTreeHelper() {
   Initialize();
 }
 
 DumpAccessibilityTreeHelper::~DumpAccessibilityTreeHelper() {
 }
 
 void DumpAccessibilityTreeHelper::DumpAccessibilityTree(
     BrowserAccessibility* node, string16* contents) {
   RecursiveDumpAccessibilityTree(node, contents, 0);
 }
 
 void DumpAccessibilityTreeHelper::RecursiveDumpAccessibilityTree(
     BrowserAccessibility* node, string16* contents, int indent) {
   scoped_array<char> prefix(new char[indent + 1]);
   for (int i = 0; i < indent; ++i)
     prefix[i] = ' ';
   prefix[indent] = '\0';
 
-  *contents += ToString(node, prefix.get());
+  string16 line = ToString(node, prefix.get());
+  if (line.find(ASCIIToUTF16(kSkipString)) != string16::npos)
+    return;
+
+  *contents += line;
   for (size_t i = 0; i < node->children().size(); ++i) {
     RecursiveDumpAccessibilityTree(node->children()[i], contents,
                                    indent + kIndentSpaces);
   }
 }
 
 void DumpAccessibilityTreeHelper::SetFilters(
     const std::set<string16>& allow_filters,
     const std::set<string16>& deny_filters) {
   allow_filters_ = allow_filters;
@@ skipping 23 matching lines @@
   if (!MatchesFilters(attr, include_by_default))
     return;
   if (!line_.empty())
     line_ += ASCIIToUTF16(" ");
   line_ += attr;
 }
 
 string16 DumpAccessibilityTreeHelper::FinishLine() {
   return line_;
 }