diff options
| author | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 20:03:31 +0000 |
|---|---|---|
| committer | justinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-05 20:03:31 +0000 |
| commit | b6bb36ef776daabd81644d0d38329c382f9d65e2 (patch) | |
| tree | b730d24a8dbc51e5771ca052f30a95af054c440d | |
| parent | 0955ce35cc41779879d63485d33b84100e2f0f09 (diff) | |
| download | chromium_src-b6bb36ef776daabd81644d0d38329c382f9d65e2.zip chromium_src-b6bb36ef776daabd81644d0d38329c382f9d65e2.tar.gz chromium_src-b6bb36ef776daabd81644d0d38329c382f9d65e2.tar.bz2 | |
Revert 186229
Broke Win Aura builder.
> Rename DumpAccesibilityTreeHelper to AccessibilityTreeFormatter, pull into content/browser.
>
> BUG=178756
>
>
> Review URL: https://chromiumcodereview.appspot.com/12389028
TBR=aboxhall@chromium.org
Review URL: https://codereview.chromium.org/12459006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186233 0039d316-1c4b-4281-b951-d872f2087c98
12 files changed, 187 insertions, 257 deletions
diff --git a/content/browser/accessibility/accessibility_tree_formatter.cc b/content/browser/accessibility/accessibility_tree_formatter.cc deleted file mode 100644 index 097ed21..0000000 --- a/content/browser/accessibility/accessibility_tree_formatter.cc +++ /dev/null @@ -1,149 +0,0 @@ -// 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/accessibility_tree_formatter.h" - -#include "base/logging.h" -#include "base/memory/scoped_ptr.h" -#include "base/string_util.h" -#include "base/strings/string_number_conversions.h" -#include "base/utf_string_conversions.h" -#include "content/browser/accessibility/browser_accessibility_manager.h" -#include "content/port/browser/render_widget_host_view_port.h" -#include "content/public/browser/render_view_host.h" -#include "content/public/browser/web_contents.h" - -namespace content { -namespace { -const int kIndentSpaces = 4; -const char* kSkipString = "@NO_DUMP"; -} - -AccessibilityTreeFormatter::AccessibilityTreeFormatter( - BrowserAccessibility* node) - : node_(node) { - Initialize(); -} - -// static -AccessibilityTreeFormatter* AccessibilityTreeFormatter::Create( - RenderViewHost* rvh) { - RenderWidgetHostViewPort* host_view = static_cast<RenderWidgetHostViewPort*>( - WebContents::FromRenderViewHost(rvh)->GetRenderWidgetHostView()); - - BrowserAccessibilityManager* manager = - host_view->GetBrowserAccessibilityManager(); - if (!manager) - return NULL; - - BrowserAccessibility* root = manager->GetRoot(); - return new AccessibilityTreeFormatter(root); -} - - -AccessibilityTreeFormatter::~AccessibilityTreeFormatter() { -} - -void AccessibilityTreeFormatter::FormatAccessibilityTree( - string16* contents) { - RecursiveFormatAccessibilityTree(node_, contents, 0); -} - -void AccessibilityTreeFormatter::RecursiveFormatAccessibilityTree( - 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'; - - 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) { - RecursiveFormatAccessibilityTree(node->children()[i], contents, - indent + kIndentSpaces); - } -} - -#if !defined(OS_WIN) && !defined(OS_MACOSX) -string16 AccessibilityTreeFormatter::ToString(BrowserAccessibility* node, - char* prefix) { - return UTF8ToUTF16(prefix) + base::IntToString16(node->renderer_id()) + - ASCIIToUTF16("\n"); -} - -void AccessibilityTreeFormatter::Initialize() {} - -// static -const base::FilePath::StringType -AccessibilityTreeFormatter::GetActualFileSuffix() { - return FILE_PATH_LITERAL(""); -} - -// static -const base::FilePath::StringType -AccessibilityTreeFormatter::GetExpectedFileSuffix() { - return FILE_PATH_LITERAL(""); -} - -// static -const std::string AccessibilityTreeFormatter::GetAllowEmptyString() { - return ""; -} - -// static -const std::string AccessibilityTreeFormatter::GetAllowString() { - return ""; -} - -// static -const std::string AccessibilityTreeFormatter::GetDenyString() { - return ""; -} -#endif - -void AccessibilityTreeFormatter::SetFilters( - const std::vector<Filter>& filters) { - filters_ = filters; -} - -bool AccessibilityTreeFormatter::MatchesFilters( - const string16& text, bool default_result) const { - std::vector<Filter>::const_iterator iter = filters_.begin(); - bool allow = default_result; - for (iter = filters_.begin(); iter != filters_.end(); ++iter) { - if (MatchPattern(text, iter->match_str)) { - if (iter->type == Filter::ALLOW_EMPTY) - allow = true; - else if (iter->type == Filter::ALLOW) - allow = (!MatchPattern(text, UTF8ToUTF16("*=''"))); - else - allow = false; - } - } - return allow; -} - -void AccessibilityTreeFormatter::StartLine() { - line_.clear(); -} - -void AccessibilityTreeFormatter::Add( - bool include_by_default, const string16& attr) { - if (attr.empty()) - return; - if (!MatchesFilters(attr, include_by_default)) - return; - if (!line_.empty()) - line_ += ASCIIToUTF16(" "); - line_ += attr; -} - -string16 AccessibilityTreeFormatter::FinishLine() { - return line_; -} - -} // namespace content diff --git a/content/browser/accessibility/accessibility_tree_formatter_utils_win.h b/content/browser/accessibility/accessibility_tree_formatter_utils_win.h deleted file mode 100644 index 0a54edd..0000000 --- a/content/browser/accessibility/accessibility_tree_formatter_utils_win.h +++ /dev/null @@ -1,27 +0,0 @@ -// 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. - -#ifndef CONTENT_BROWSER_ACCESSIBILITY_ACCESSIBILITY_TREE_FORMATTER_UTILS_WIN_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_ACCESSIBILITY_TREE_FORMATTER_UTILS_WIN_H_ - -#include <vector> - -#include "base/basictypes.h" -#include "base/string16.h" -#include "content/common/content_export.h" - -namespace content { - -CONTENT_EXPORT string16 IAccessibleRoleToString(int32 ia_role); -CONTENT_EXPORT string16 IAccessible2RoleToString(int32 ia_role); -CONTENT_EXPORT string16 IAccessibleStateToString(int32 ia_state); -CONTENT_EXPORT void IAccessibleStateToStringVector( - int32 ia_state, std::vector<string16>* result); -CONTENT_EXPORT string16 IAccessible2StateToString(int32 ia2_state); -CONTENT_EXPORT void IAccessible2StateToStringVector( - int32 ia_state, std::vector<string16>* result); - -} // namespace content - -#endif // CONTENT_BROWSER_ACCESSIBILITY_ACCESSIBILITY_TREE_FORMATTER_UTILS_WIN_H_ diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc index c369c65..8ad8eb1 100644 --- a/content/browser/accessibility/accessibility_win_browsertest.cc +++ b/content/browser/accessibility/accessibility_win_browsertest.cc @@ -9,7 +9,6 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/win/scoped_comptr.h" -#include "content/browser/accessibility/accessibility_tree_formatter_utils_win.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" @@ -17,6 +16,7 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "content/public/test/accessibility_test_utils_win.h" #include "content/public/test/test_utils.h" #include "content/shell/shell.h" #include "content/test/content_browser_test.h" diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index f5f05a9..d2557f2 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -13,9 +13,9 @@ #include "base/string16.h" #include "base/strings/string_split.h" #include "base/utf_string_conversions.h" -#include "content/browser/accessibility/accessibility_tree_formatter.h" #include "content/browser/accessibility/browser_accessibility.h" #include "content/browser/accessibility/browser_accessibility_manager.h" +#include "content/browser/accessibility/dump_accessibility_tree_helper.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/port/browser/render_widget_host_view_port.h" #include "content/public/browser/web_contents.h" @@ -44,7 +44,7 @@ const char kSignalDiff[] = "*"; } // namespace -typedef AccessibilityTreeFormatter::Filter Filter; +typedef DumpAccessibilityTreeHelper::Filter Filter; // This test takes a snapshot of the platform BrowserAccessibility tree and // tests it against an expected baseline. @@ -98,12 +98,9 @@ class DumpAccessibilityTreeTest : public ContentBrowserTest { iter != lines.end(); ++iter) { const std::string& line = *iter; - const std::string& allow_empty_str = - AccessibilityTreeFormatter::GetAllowEmptyString(); - const std::string& allow_str = - AccessibilityTreeFormatter::GetAllowString(); - const std::string& deny_str = - AccessibilityTreeFormatter::GetDenyString(); + const std::string& allow_empty_str = helper_.GetAllowEmptyString(); + const std::string& allow_str = helper_.GetAllowString(); + const std::string& deny_str = helper_.GetDenyString(); if (StartsWithASCII(line, allow_empty_str, true)) { filters->push_back( Filter(UTF8ToUTF16(line.substr(allow_empty_str.size())), @@ -119,6 +116,8 @@ class DumpAccessibilityTreeTest : public ContentBrowserTest { } void RunTest(const base::FilePath::CharType* file_path); + + DumpAccessibilityTreeHelper helper_; }; void DumpAccessibilityTreeTest::RunTest( @@ -148,12 +147,20 @@ void DumpAccessibilityTreeTest::RunTest( std::string html_contents; file_util::ReadFileToString(html_file, &html_contents); + // Parse filters in the test file. + std::vector<Filter> filters; + AddDefaultFilters(&filters); + ParseFilters(html_contents, &filters); + helper_.SetFilters(filters); + // Read the expected file. std::string expected_contents_raw; base::FilePath expected_file = base::FilePath(html_file.RemoveExtension().value() + - AccessibilityTreeFormatter::GetExpectedFileSuffix()); - file_util::ReadFileToString(expected_file, &expected_contents_raw); + helper_.GetExpectedFileSuffix()); + file_util::ReadFileToString( + expected_file, + &expected_contents_raw); // Tolerate Windows-style line endings (\r\n) in the expected file: // normalize by deleting all \r from the file (if any) to leave only \n. @@ -178,18 +185,11 @@ void DumpAccessibilityTreeTest::RunTest( // Wait for the tree. loop_runner->Run(); - AccessibilityTreeFormatter formatter( - host_view->GetBrowserAccessibilityManager()->GetRoot()); - - // Parse filters in the test file. - std::vector<Filter> filters; - AddDefaultFilters(&filters); - ParseFilters(html_contents, &filters); - formatter.SetFilters(filters); - // Perform a diff (or write the initial baseline). string16 actual_contents_utf16; - formatter.FormatAccessibilityTree(&actual_contents_utf16); + helper_.DumpAccessibilityTree( + host_view->GetBrowserAccessibilityManager()->GetRoot(), + &actual_contents_utf16); std::string actual_contents = UTF16ToUTF8(actual_contents_utf16); std::vector<std::string> actual_lines, expected_lines; Tokenize(actual_contents, "\n", &actual_lines); @@ -226,7 +226,7 @@ void DumpAccessibilityTreeTest::RunTest( if (!file_util::PathExists(expected_file)) { base::FilePath actual_file = base::FilePath(html_file.RemoveExtension().value() + - AccessibilityTreeFormatter::GetActualFileSuffix()); + helper_.GetActualFileSuffix()); EXPECT_TRUE(file_util::WriteFile( actual_file, actual_contents.c_str(), actual_contents.size())); diff --git a/content/browser/accessibility/dump_accessibility_tree_helper.cc b/content/browser/accessibility/dump_accessibility_tree_helper.cc new file mode 100644 index 0000000..99efca2 --- /dev/null +++ b/content/browser/accessibility/dump_accessibility_tree_helper.cc @@ -0,0 +1,89 @@ +// 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" +#include "base/utf_string_conversions.h" + +namespace content { +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'; + + 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::vector<Filter>& filters) { + filters_ = filters; +} + +bool DumpAccessibilityTreeHelper::MatchesFilters( + const string16& text, bool default_result) { + std::vector<Filter>::const_iterator iter = filters_.begin(); + bool allow = default_result; + for (iter = filters_.begin(); iter != filters_.end(); ++iter) { + if (MatchPattern(text, iter->match_str)) { + if (iter->type == Filter::ALLOW_EMPTY) + allow = true; + else if (iter->type == Filter::ALLOW) + allow = (!MatchPattern(text, UTF8ToUTF16("*=''"))); + else + allow = false; + } + } + return allow; +} + +void DumpAccessibilityTreeHelper::StartLine() { + line_.clear(); +} + +void DumpAccessibilityTreeHelper::Add( + bool include_by_default, const string16& attr) { + if (attr.empty()) + return; + if (!MatchesFilters(attr, include_by_default)) + return; + if (!line_.empty()) + line_ += ASCIIToUTF16(" "); + line_ += attr; +} + +string16 DumpAccessibilityTreeHelper::FinishLine() { + return line_; +} + +} // namespace content diff --git a/content/browser/accessibility/accessibility_tree_formatter.h b/content/browser/accessibility/dump_accessibility_tree_helper.h index ca51a68..ff5883b 100644 --- a/content/browser/accessibility/accessibility_tree_formatter.h +++ b/content/browser/accessibility/dump_accessibility_tree_helper.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CONTENT_BROWSER_ACCESSIBILITY_ACCESSIBILITY_TREE_FORMATTER_H_ -#define CONTENT_BROWSER_ACCESSIBILITY_ACCESSIBILITY_TREE_FORMATTER_H_ +#ifndef CONTENT_BROWSER_ACCESSIBILITY_DUMP_ACCESSIBILITY_TREE_HELPER_H_ +#define CONTENT_BROWSER_ACCESSIBILITY_DUMP_ACCESSIBILITY_TREE_HELPER_H_ #include <vector> @@ -11,25 +11,20 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" #include "content/browser/accessibility/browser_accessibility.h" -#include "content/common/content_export.h" namespace content { -class RenderViewHost; - -// A utility class for formatting platform-specific accessibility information, -// for use in testing, debugging, and developer tools. +// A utility class for retrieving platform specific accessibility information. // This is extended by a subclass for each platform where accessibility is // implemented. -class CONTENT_EXPORT AccessibilityTreeFormatter { +class DumpAccessibilityTreeHelper { public: - explicit AccessibilityTreeFormatter(BrowserAccessibility* node); - virtual ~AccessibilityTreeFormatter(); - - static AccessibilityTreeFormatter* Create(RenderViewHost* rvh); + DumpAccessibilityTreeHelper(); + virtual ~DumpAccessibilityTreeHelper(); // Dumps a BrowserAccessibility tree into a string. - void FormatAccessibilityTree(string16* contents); + void DumpAccessibilityTree(BrowserAccessibility* node, + string16* contents); // A single filter specification. See GetAllowString() and GetDenyString() // for more information. @@ -55,8 +50,8 @@ class CONTENT_EXPORT AccessibilityTreeFormatter { // HTML test: test-file.html // Expected: test-file-expected-mac.txt. // Auto-generated: test-file-actual-mac.txt - static const base::FilePath::StringType GetActualFileSuffix(); - static const base::FilePath::StringType GetExpectedFileSuffix(); + const base::FilePath::StringType GetActualFileSuffix() const; + const base::FilePath::StringType GetExpectedFileSuffix() const; // A platform-specific string that indicates a given line in a file // is an allow-empty, allow or deny filter. Example: @@ -71,14 +66,14 @@ class CONTENT_EXPORT AccessibilityTreeFormatter { // @MAC-DENY:subrole* // --> // <p>Text</p> - static const std::string GetAllowEmptyString(); - static const std::string GetAllowString(); - static const std::string GetDenyString(); + const std::string GetAllowEmptyString() const; + const std::string GetAllowString() const; + const std::string GetDenyString() const; protected: - void RecursiveFormatAccessibilityTree(BrowserAccessibility* node, - string16* contents, - int indent); + void RecursiveDumpAccessibilityTree(BrowserAccessibility* node, + string16* contents, + int indent); // Returns a platform specific representation of a BrowserAccessibility. // Should be zero or more complete lines, each with |prefix| prepended @@ -87,18 +82,17 @@ class CONTENT_EXPORT AccessibilityTreeFormatter { void Initialize(); - bool MatchesFilters(const string16& text, bool default_result) const; + bool MatchesFilters(const string16& text, bool default_result); void StartLine(); void Add(bool include_by_default, const string16& attr); string16 FinishLine(); - BrowserAccessibility* node_; std::vector<Filter> filters_; string16 line_; - DISALLOW_COPY_AND_ASSIGN(AccessibilityTreeFormatter); + DISALLOW_COPY_AND_ASSIGN(DumpAccessibilityTreeHelper); }; } // namespace content -#endif // CONTENT_BROWSER_ACCESSIBILITY_ACCESSIBILITY_TREE_FORMATTER_H_ +#endif // CONTENT_BROWSER_ACCESSIBILITY_DUMP_ACCESSIBILITY_TREE_HELPER_H_ diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm index 80b8d48..669956b 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm +++ b/content/browser/accessibility/dump_accessibility_tree_helper_mac.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/accessibility/accessibility_tree_formatter.h" +#include "content/browser/accessibility/dump_accessibility_tree_helper.h" #import <Cocoa/Cocoa.h> @@ -66,9 +66,9 @@ string16 FormatSize(BrowserAccessibility* node) { } // namespace -void AccessibilityTreeFormatter::Initialize() {} +void DumpAccessibilityTreeHelper::Initialize() {} -string16 AccessibilityTreeFormatter::ToString(BrowserAccessibility* node, +string16 DumpAccessibilityTreeHelper::ToString(BrowserAccessibility* node, char* prefix) { StartLine(); Add(true, Format(node, "", @selector(role), "")); @@ -112,30 +112,27 @@ string16 AccessibilityTreeFormatter::ToString(BrowserAccessibility* node, return ASCIIToUTF16(prefix) + FinishLine() + ASCIIToUTF16("\n"); } -// static const base::FilePath::StringType -AccessibilityTreeFormatter::GetActualFileSuffix() { +DumpAccessibilityTreeHelper::GetActualFileSuffix() + const { return FILE_PATH_LITERAL("-actual-mac.txt"); } -// static const base::FilePath::StringType -AccessibilityTreeFormatter::GetExpectedFileSuffix() { +DumpAccessibilityTreeHelper::GetExpectedFileSuffix() + const { return FILE_PATH_LITERAL("-expected-mac.txt"); } -// static -const std::string AccessibilityTreeFormatter::GetAllowEmptyString() { +const std::string DumpAccessibilityTreeHelper::GetAllowEmptyString() const { return "@MAC-ALLOW-EMPTY:"; } -// static -const std::string AccessibilityTreeFormatter::GetAllowString() { +const std::string DumpAccessibilityTreeHelper::GetAllowString() const { return "@MAC-ALLOW:"; } -// static -const std::string AccessibilityTreeFormatter::GetDenyString() { +const std::string DumpAccessibilityTreeHelper::GetDenyString() const { return "@MAC-DENY:"; } diff --git a/content/browser/accessibility/accessibility_tree_formatter_win.cc b/content/browser/accessibility/dump_accessibility_tree_helper_win.cc index bf7495f..6dcbcc9 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_win.cc +++ b/content/browser/accessibility/dump_accessibility_tree_helper_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/accessibility/accessibility_tree_formatter.h" +#include "content/browser/accessibility/dump_accessibility_tree_helper.h" #include <oleacc.h> @@ -12,20 +12,21 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" -#include "content/browser/accessibility/accessibility_tree_formatter_utils_win.h" #include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/accessibility/browser_accessibility_win.h" #include "content/common/accessibility_node_data.h" +#include "content/public/test/accessibility_test_utils_win.h" +#include "testing/gtest/include/gtest/gtest.h" #include "third_party/iaccessible2/ia2_api_all.h" #include "ui/base/win/atl_module.h" namespace content { -void AccessibilityTreeFormatter::Initialize() { +void DumpAccessibilityTreeHelper::Initialize() { ui::win::CreateATLModuleIfNeeded(); } -string16 AccessibilityTreeFormatter::ToString( +string16 DumpAccessibilityTreeHelper::ToString( BrowserAccessibility* node, char* prefix) { BrowserAccessibilityWin* acc_obj = node->ToBrowserAccessibilityWin(); @@ -159,30 +160,25 @@ string16 AccessibilityTreeFormatter::ToString( return UTF8ToUTF16(prefix) + FinishLine() + ASCIIToUTF16("\n"); } -// static const base::FilePath::StringType -AccessibilityTreeFormatter::GetActualFileSuffix() { +DumpAccessibilityTreeHelper::GetActualFileSuffix() const { return FILE_PATH_LITERAL("-actual-win.txt"); } -// static const base::FilePath::StringType -AccessibilityTreeFormatter::GetExpectedFileSuffix() { +DumpAccessibilityTreeHelper::GetExpectedFileSuffix() const { return FILE_PATH_LITERAL("-expected-win.txt"); } -// static -const std::string AccessibilityTreeFormatter::GetAllowEmptyString() { +const std::string DumpAccessibilityTreeHelper::GetAllowEmptyString() const { return "@WIN-ALLOW-EMPTY:"; } -// static -const std::string AccessibilityTreeFormatter::GetAllowString() { +const std::string DumpAccessibilityTreeHelper::GetAllowString() const { return "@WIN-ALLOW:"; } -// static -const std::string AccessibilityTreeFormatter::GetDenyString() { +const std::string DumpAccessibilityTreeHelper::GetDenyString() const { return "@WIN-DENY:"; } diff --git a/content/content_browser.gypi b/content/content_browser.gypi index c405779..69127b9 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -180,12 +180,6 @@ 'public/browser/worker_service.h', 'public/browser/worker_service_observer.h', 'public/browser/zygote_host_linux.h', - 'browser/accessibility/accessibility_tree_formatter.cc', - 'browser/accessibility/accessibility_tree_formatter.h', - 'browser/accessibility/accessibility_tree_formatter_mac.mm', - 'browser/accessibility/accessibility_tree_formatter_utils_win.cc', - 'browser/accessibility/accessibility_tree_formatter_utils_win.h', - 'browser/accessibility/accessibility_tree_formatter_win.cc', 'browser/accessibility/browser_accessibility.cc', 'browser/accessibility/browser_accessibility.h', 'browser/accessibility/browser_accessibility_cocoa.h', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 105b522b..8ccdbff 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -24,6 +24,8 @@ '..', ], 'sources': [ + 'public/test/accessibility_test_utils_win.cc', + 'public/test/accessibility_test_utils_win.h', 'public/test/browser_test.h', 'public/test/browser_test_base.cc', 'public/test/browser_test_base.h', @@ -693,6 +695,10 @@ 'browser/accessibility/accessibility_win_browsertest.cc', 'browser/accessibility/cross_platform_accessibility_browsertest.cc', 'browser/accessibility/dump_accessibility_tree_browsertest.cc', + 'browser/accessibility/dump_accessibility_tree_helper.cc', + 'browser/accessibility/dump_accessibility_tree_helper.h', + 'browser/accessibility/dump_accessibility_tree_helper_mac.mm', + 'browser/accessibility/dump_accessibility_tree_helper_win.cc', 'browser/appcache/appcache_browsertest.cc', 'browser/bookmarklet_browsertest.cc', 'browser/browser_plugin/browser_plugin_host_browsertest.cc', @@ -821,11 +827,13 @@ ['OS=="linux"', { 'sources!': [ 'browser/accessibility/dump_accessibility_tree_browsertest.cc', + 'browser/accessibility/dump_accessibility_tree_helper.cc', ], }], ['OS=="android"', { 'sources!': [ 'browser/accessibility/dump_accessibility_tree_browsertest.cc', + 'browser/accessibility/dump_accessibility_tree_helper.cc', # These are included via dependency on content_common and hence # we get multiple definition errors in a shared library build. # Other builds need it as the symbols are not exported. @@ -853,6 +861,8 @@ 'sources!': [ 'browser/accessibility/accessibility_win_browsertest.cc', 'browser/accessibility/dump_accessibility_tree_browsertest.cc', + 'browser/accessibility/dump_accessibility_tree_helper_win.cc', + 'browser/accessibility/dump_accessibility_tree_helper.cc', 'browser/plugin_browsertest.cc', ], }], diff --git a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc b/content/public/test/accessibility_test_utils_win.cc index 5e57954..b98d7ce 100644 --- a/content/browser/accessibility/accessibility_tree_formatter_utils_win.cc +++ b/content/public/test/accessibility_test_utils_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/browser/accessibility/accessibility_tree_formatter_utils_win.h" +#include "content/public/test/accessibility_test_utils_win.h" #include <oleacc.h> diff --git a/content/public/test/accessibility_test_utils_win.h b/content/public/test/accessibility_test_utils_win.h new file mode 100644 index 0000000..55bff66 --- /dev/null +++ b/content/public/test/accessibility_test_utils_win.h @@ -0,0 +1,26 @@ +// 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. + +#ifndef CONTENT_PUBLIC_TEST_ACCESSIBILITY_TEST_UTILS_WIN_H_ +#define CONTENT_PUBLIC_TEST_ACCESSIBILITY_TEST_UTILS_WIN_H_ + +#include <vector> + +#include "base/basictypes.h" +#include "base/string16.h" + +namespace content { + +string16 IAccessibleRoleToString(int32 ia_role); +string16 IAccessible2RoleToString(int32 ia_role); +string16 IAccessibleStateToString(int32 ia_state); +void IAccessibleStateToStringVector(int32 ia_state, + std::vector<string16>* result); +string16 IAccessible2StateToString(int32 ia2_state); +void IAccessible2StateToStringVector(int32 ia_state, + std::vector<string16>* result); + +} // namespace content + +#endif // CONTENT_PUBLIC_TEST_ACCESSIBILITY_TEST_UTILS_WIN_H_ |