diff options
| author | shreeram.k <shreeram.k@samsung.com> | 2014-10-15 21:15:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 04:16:08 +0000 |
| commit | 63f592c3d6ebccedda711630a51835deecf174da (patch) | |
| tree | 18c54e9b6b3b670904f66e96b4d845fd5f2e70a2 | |
| parent | 805eabb91d386c86bd64336c7643f6dfa864151d (diff) | |
| download | chromium_src-63f592c3d6ebccedda711630a51835deecf174da.zip chromium_src-63f592c3d6ebccedda711630a51835deecf174da.tar.gz chromium_src-63f592c3d6ebccedda711630a51835deecf174da.tar.bz2 | |
Enabling SVG AX test.
BUG=265619
Review URL: https://codereview.chromium.org/658713003
Cr-Commit-Position: refs/heads/master@{#299836}
6 files changed, 9 insertions, 10 deletions
diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc index 5ab470e..8302ad8 100644 --- a/content/browser/accessibility/browser_accessibility_android.cc +++ b/content/browser/accessibility/browser_accessibility_android.cc @@ -240,6 +240,7 @@ const char* BrowserAccessibilityAndroid::GetClassName() const { break; case ui::AX_ROLE_CANVAS: case ui::AX_ROLE_IMAGE: + case ui::AX_ROLE_SVG_ROOT: class_name = "android.widget.Image"; break; case ui::AX_ROLE_PROGRESS_INDICATOR: diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index a5066a6..1f5c916 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -803,9 +803,7 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySub) { RunTest(FILE_PATH_LITERAL("sub.html")); } -// TODO(dmazzoni): Rebaseline this test after Blink rolls past r155083. -// See http://crbug.com/265619 -IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, DISABLED_AccessibilitySvg) { +IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilitySvg) { RunTest(FILE_PATH_LITERAL("svg.html")); } diff --git a/content/test/data/accessibility/svg-expected-android.txt b/content/test/data/accessibility/svg-expected-android.txt index 90bde2c..8084de1 100644 --- a/content/test/data/accessibility/svg-expected-android.txt +++ b/content/test/data/accessibility/svg-expected-android.txt @@ -1,4 +1,4 @@ android.webkit.WebView focusable focused scrollable android.view.View - android.view.View focusable name='svg' - android.view.View clickable focusable name='Test' + android.widget.Image name='svg' + android.view.View clickable name='Test' diff --git a/content/test/data/accessibility/svg-expected-mac.txt b/content/test/data/accessibility/svg-expected-mac.txt index 1352fa8..adb1259 100644 --- a/content/test/data/accessibility/svg-expected-mac.txt +++ b/content/test/data/accessibility/svg-expected-mac.txt @@ -1,5 +1,5 @@ AXWebArea AXGroup AXGroup AXDescription='svg' - AXGroup AXTitle='Test' + AXGroup AXStaticText AXValue='Test' diff --git a/content/test/data/accessibility/svg-expected-win.txt b/content/test/data/accessibility/svg-expected-win.txt index eaa52e2..105a88d54 100644 --- a/content/test/data/accessibility/svg-expected-win.txt +++ b/content/test/data/accessibility/svg-expected-win.txt @@ -1,5 +1,5 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE IA2_ROLE_SECTION READONLY - ROLE_SYSTEM_GRAPHIC name='svg' FOCUSABLE - IA2_ROLE_SECTION name='Test' FOCUSABLE - ROLE_SYSTEM_TEXT name='Test' READONLY + ROLE_SYSTEM_GRAPHIC name='svg' + IA2_ROLE_SECTION READONLY + ROLE_SYSTEM_STATICTEXT name='Test' diff --git a/content/test/data/accessibility/svg.html b/content/test/data/accessibility/svg.html index 1b7a175..88c1003 100644 --- a/content/test/data/accessibility/svg.html +++ b/content/test/data/accessibility/svg.html @@ -1,7 +1,7 @@ <!-- @MAC-ALLOW:AXDescription='svg' --> -<!doctype html> +<!DOCTYPE html> <html> <body> |