Reland 149510 - Allow filters in accessibility tests to specify which attributes to check.

content/browser/accessibility/dump_accessibility_tree_helper.h

Index: content/browser/accessibility/dump_accessibility_tree_helper.h
===================================================================
--- content/browser/accessibility/dump_accessibility_tree_helper.h	(revision 149572)
+++ content/browser/accessibility/dump_accessibility_tree_helper.h	(working copy)
@@ -5,6 +5,8 @@
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_DUMP_ACCESSIBILITY_TREE_HELPER_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_DUMP_ACCESSIBILITY_TREE_HELPER_H_
 
+#include <set>
+
 #include "base/file_path.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ -15,10 +17,18 @@
 // implemented.
 class DumpAccessibilityTreeHelper {
  public:
+  DumpAccessibilityTreeHelper();
+  virtual ~DumpAccessibilityTreeHelper();
+
   // Dumps a BrowserAccessibility tree into a string.
   void DumpAccessibilityTree(BrowserAccessibility* node,
                              string16* contents);
 
+  // Set regular expression filters that apply to each component of every
+  // line before it's output.
+  void SetFilters(const std::set<string16>& allow_filters,
+                  const std::set<string16>& deny_filters);
+
   // Suffix of the expectation file corresponding to html file.
   // Example:
   // HTML test:      test-file.html
@@ -27,6 +37,20 @@
   const FilePath::StringType GetActualFileSuffix() const;
   const FilePath::StringType GetExpectedFileSuffix() const;
 
+  // A platform-specific string that indicates a given line in a file
+  // is an allow or deny filter. Example:
+  // Mac values:
+  //   GetAllowString() -> "@MAC-ALLOW:"
+  //   GetDenyString() -> "@MAC-DENY:"
+  // Example html:
+  // <!--
+  // @MAC-ALLOW:roleDescription*
+  // @MAC-DENY:subrole*
+  // -->
+  // <p>Text</p>
+  const std::string GetAllowString() const;
+  const std::string GetDenyString() const;
+
  protected:
   void RecursiveDumpAccessibilityTree(BrowserAccessibility* node,
                                       string16* contents,
@@ -38,6 +62,17 @@
   string16 ToString(BrowserAccessibility* node, char* prefix);
 
   void Initialize();
+
+  bool MatchesFilters(const string16& text, bool default_result);
+  void StartLine();
+  void Add(bool include_by_default, const string16& attr);
+  string16 FinishLine();
+
+  std::set<string16> allow_filters_;
+  std::set<string16> deny_filters_;
+  string16 line_;
+
+  DISALLOW_COPY_AND_ASSIGN(DumpAccessibilityTreeHelper);
 };
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_DUMP_ACCESSIBILITY_TREE_HELPER_H_
Property changes on: content/browser/accessibility/dump_accessibility_tree_helper.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property