Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Side by Side Diff: content/browser/accessibility/site_per_process_accessibility_browsertest.cc

Issue 864963003: Enable SitePerProcessAccessibilityBrowserTest on more platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@more_robust_site_isolation_a11y
Patch Set: Removed debugging, ready for review Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "content/browser/accessibility/browser_accessibility.h" 7 #include "content/browser/accessibility/browser_accessibility.h"
8 #include "content/browser/accessibility/browser_accessibility_manager.h" 8 #include "content/browser/accessibility/browser_accessibility_manager.h"
9 #include "content/browser/accessibility/browser_accessibility_state_impl.h" 9 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
10 #include "content/browser/frame_host/cross_process_frame_connector.h" 10 #include "content/browser/frame_host/cross_process_frame_connector.h"
(...skipping 28 matching lines...) Expand all
39 }; 39 };
40 40
41 // Utility function to determine if an accessibility tree has finished loading 41 // Utility function to determine if an accessibility tree has finished loading
42 // or if the tree represents a page that hasn't finished loading yet. 42 // or if the tree represents a page that hasn't finished loading yet.
43 bool AccessibilityTreeIsLoaded(BrowserAccessibilityManager* manager) { 43 bool AccessibilityTreeIsLoaded(BrowserAccessibilityManager* manager) {
44 BrowserAccessibility* root = manager->GetRoot(); 44 BrowserAccessibility* root = manager->GetRoot();
45 return (root->GetFloatAttribute(ui::AX_ATTR_DOC_LOADING_PROGRESS) == 1.0 && 45 return (root->GetFloatAttribute(ui::AX_ATTR_DOC_LOADING_PROGRESS) == 1.0 &&
46 root->GetStringAttribute(ui::AX_ATTR_DOC_URL) != url::kAboutBlankURL); 46 root->GetStringAttribute(ui::AX_ATTR_DOC_URL) != url::kAboutBlankURL);
47 } 47 }
48 48
49 // TODO(nasko): try enabling this test on more platforms once 49 // Times out on Android, not clear if it's an actual bug or just slow.
50 // SitePerProcessBrowserTest.CrossSiteIframe is enabled everywhere. 50 #if defined(OS_ANDROID)
dmazzoni 2015/01/28 19:29:00 Currently Android only uses one process for all re
nasko 2015/02/03 17:08:18 Are you sure about that? We do run our site-per-pr
dmazzoni 2015/02/03 17:15:29 I'll dig into it more. Maybe I'll land this change
51 // http://crbug.com/399775 51 #define MAYBE_CrossSiteIframeAccessibility DISABLED_CrossSiteIframeAccessibility
52 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 52 #else
53 #define MAYBE_CrossSiteIframeAccessibility CrossSiteIframeAccessibility 53 #define MAYBE_CrossSiteIframeAccessibility CrossSiteIframeAccessibility
54 #else
55 #define MAYBE_CrossSiteIframeAccessibility DISABLED_CrossSiteIframeAccessibility
56 #endif 54 #endif
57 IN_PROC_BROWSER_TEST_F(SitePerProcessAccessibilityBrowserTest, 55 IN_PROC_BROWSER_TEST_F(SitePerProcessAccessibilityBrowserTest,
58 MAYBE_CrossSiteIframeAccessibility) { 56 MAYBE_CrossSiteIframeAccessibility) {
59 // Enable full accessibility for all current and future WebContents. 57 // Enable full accessibility for all current and future WebContents.
60 BrowserAccessibilityState::GetInstance()->EnableAccessibility(); 58 BrowserAccessibilityState::GetInstance()->EnableAccessibility();
61 59
62 AccessibilityNotificationWaiter main_frame_accessibility_waiter( 60 AccessibilityNotificationWaiter main_frame_accessibility_waiter(
63 shell(), AccessibilityModeComplete, 61 shell(), AccessibilityModeComplete,
64 ui::AX_EVENT_LOAD_COMPLETE); 62 ui::AX_EVENT_LOAD_COMPLETE);
65 63
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 BrowserAccessibility* ax_child_frame_static_text = 154 BrowserAccessibility* ax_child_frame_static_text =
157 ax_child_frame_group->PlatformGetChild(0); 155 ax_child_frame_group->PlatformGetChild(0);
158 EXPECT_EQ(ui::AX_ROLE_STATIC_TEXT, ax_child_frame_static_text->GetRole()); 156 EXPECT_EQ(ui::AX_ROLE_STATIC_TEXT, ax_child_frame_static_text->GetRole());
159 ASSERT_EQ(0U, ax_child_frame_static_text->PlatformChildCount()); 157 ASSERT_EQ(0U, ax_child_frame_static_text->PlatformChildCount());
160 158
161 // Last, check that the parent of the child frame root is correct. 159 // Last, check that the parent of the child frame root is correct.
162 EXPECT_EQ(ax_child_frame_root->GetParent(), ax_scroll_area); 160 EXPECT_EQ(ax_child_frame_root->GetParent(), ax_scroll_area);
163 } 161 }
164 162
165 } // namespace content 163 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/frame_accessibility.cc » ('j') | content/browser/frame_host/frame_accessibility.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698