Index: content/browser/web_contents/web_contents_impl.cc |
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc |
index 1256f58c10f136a077a2871972a853f07725c108..88909c7461f9bd03338871194fc93c305dc7f11d 100644 |
--- a/content/browser/web_contents/web_contents_impl.cc |
+++ b/content/browser/web_contents/web_contents_impl.cc |
@@ -18,6 +18,8 @@ |
#include "base/strings/string_util.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/time/time.h" |
+#include "content/browser/accessibility/accessibility_mode_helper.h" |
+#include "content/browser/accessibility/browser_accessibility_state_impl.h" |
#include "content/browser/browser_plugin/browser_plugin_embedder.h" |
#include "content/browser/browser_plugin/browser_plugin_guest.h" |
#include "content/browser/child_process_security_policy_impl.h" |
@@ -70,6 +72,7 @@ |
#include "content/public/browser/navigation_details.h" |
#include "content/public/browser/notification_details.h" |
#include "content/public/browser/notification_service.h" |
+#include "content/public/browser/render_widget_host_iterator.h" |
#include "content/public/browser/resource_request_details.h" |
#include "content/public/browser/storage_partition.h" |
#include "content/public/browser/user_metrics.h" |
@@ -217,6 +220,11 @@ void SendToAllFramesInternal(IPC::Message* message, RenderFrameHost* rfh) { |
rfh->Send(message_copy); |
} |
+void SetAccessibilityModeOnFrame(AccessibilityMode mode, |
+ RenderFrameHost* frame_host) { |
+ static_cast<RenderFrameHostImpl*>(frame_host)->SetAccessibilityMode(mode); |
+} |
+ |
} // namespace |
WebContents* WebContents::Create(const WebContents::CreateParams& params) { |
@@ -344,7 +352,9 @@ WebContentsImpl::WebContentsImpl( |
render_view_message_source_(NULL), |
fullscreen_widget_routing_id_(MSG_ROUTING_NONE), |
is_subframe_(false), |
- last_dialog_suppressed_(false) { |
+ last_dialog_suppressed_(false), |
+ accessibility_mode_( |
+ BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()) { |
for (size_t i = 0; i < g_created_callbacks.Get().size(); i++) |
g_created_callbacks.Get().at(i).Run(this); |
frame_tree_.SetFrameRemoveListener( |
@@ -448,6 +458,30 @@ WebContentsImpl* WebContentsImpl::CreateWithOpener( |
return new_contents; |
} |
+// static |
+std::vector<WebContentsImpl*> WebContentsImpl::GetAllWebContents() { |
+ std::vector<WebContentsImpl*> result; |
+ scoped_ptr<RenderWidgetHostIterator> widgets( |
+ RenderWidgetHostImpl::GetRenderWidgetHosts()); |
+ std::set<WebContentsImpl*> web_contents_set; |
+ while (RenderWidgetHost* rwh = widgets->GetNextHost()) { |
+ if (!rwh->IsRenderView()) |
+ continue; |
+ RenderViewHost* rvh = RenderViewHost::From(rwh); |
+ if (!rvh) |
+ continue; |
+ WebContents* web_contents = WebContents::FromRenderViewHost(rvh); |
+ if (!web_contents) |
+ continue; |
+ WebContentsImpl* wci = static_cast<WebContentsImpl*>(web_contents); |
+ if (web_contents_set.find(wci) == web_contents_set.end()) { |
+ web_contents_set.insert(wci); |
+ result.push_back(wci); |
+ } |
+ } |
+ return result; |
+} |
+ |
RenderFrameHostManager* WebContentsImpl::GetRenderManagerForTesting() { |
return GetRenderManager(); |
} |
@@ -670,6 +704,29 @@ WebContentsView* WebContentsImpl::GetView() const { |
return view_.get(); |
} |
+void WebContentsImpl::SetAccessibilityMode(AccessibilityMode mode) { |
+ if (mode == accessibility_mode_) |
+ return; |
+ |
+ accessibility_mode_ = mode; |
+ frame_tree_.ForEach( |
+ base::Bind(&ForEachFrameInternal, |
+ base::Bind(&SetAccessibilityModeOnFrame, mode))); |
+ frame_tree_.ForEach( |
+ base::Bind(&ForEachPendingFrameInternal, |
+ base::Bind(&SetAccessibilityModeOnFrame, mode))); |
+} |
+ |
+void WebContentsImpl::AddAccessibilityMode(AccessibilityMode mode) { |
+ SetAccessibilityMode( |
+ content::AddAccessibilityModeTo(accessibility_mode_, mode)); |
+} |
+ |
+void WebContentsImpl::RemoveAccessibilityMode(AccessibilityMode mode) { |
+ SetAccessibilityMode( |
+ content::RemoveAccessibilityModeFrom(accessibility_mode_, mode)); |
+} |
+ |
WebUI* WebContentsImpl::CreateWebUI(const GURL& url) { |
WebUIImpl* web_ui = new WebUIImpl(this); |
WebUIController* controller = WebUIControllerFactoryRegistry::GetInstance()-> |
@@ -718,12 +775,25 @@ const std::string& WebContentsImpl::GetUserAgentOverride() const { |
return renderer_preferences_.user_agent_override; |
} |
+void WebContentsImpl::EnableTreeOnlyAccessibilityMode() { |
+ AddAccessibilityMode(AccessibilityModeTreeOnly); |
+} |
+ |
+bool WebContentsImpl::IsTreeOnlyAccessibilityModeForTesting() const { |
+ return accessibility_mode() == AccessibilityModeTreeOnly; |
+} |
+ |
+bool WebContentsImpl::IsFullAccessibilityModeForTesting() const { |
+ return accessibility_mode() == AccessibilityModeComplete; |
+} |
+ |
#if defined(OS_WIN) |
void WebContentsImpl::SetParentNativeViewAccessible( |
gfx::NativeViewAccessible accessible_parent) { |
accessible_parent_ = accessible_parent; |
- if (GetRenderViewHost()) |
- GetRenderViewHostImpl()->SetParentNativeViewAccessible(accessible_parent); |
+ RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(GetMainFrame()); |
+ if (rfh) |
+ rfh->SetParentNativeViewAccessible(accessible_parent); |
} |
#endif |
@@ -1247,12 +1317,6 @@ bool WebContentsImpl::HandleGestureEvent( |
return false; |
} |
-#if defined(OS_WIN) |
-gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() { |
- return accessible_parent_; |
-} |
-#endif |
- |
void WebContentsImpl::HandleMouseDown() { |
if (delegate_) |
delegate_->HandleMouseDown(); |
@@ -1643,6 +1707,10 @@ FrameTree* WebContentsImpl::GetFrameTree() { |
return &frame_tree_; |
} |
+AccessibilityMode WebContentsImpl::GetAccessibilityMode() const { |
+ return accessibility_mode_; |
+} |
+ |
void WebContentsImpl::AccessibilityEventReceived( |
const std::vector<AXEventNotificationDetails>& details) { |
FOR_EACH_OBSERVER( |
@@ -1674,6 +1742,12 @@ void WebContentsImpl::DidSendScreenRects(RenderWidgetHostImpl* rwh) { |
browser_plugin_embedder_->DidSendScreenRects(); |
} |
+BrowserAccessibilityManager* |
+ WebContentsImpl::GetRootBrowserAccessibilityManager() { |
+ RenderFrameHostImpl* rfh = static_cast<RenderFrameHostImpl*>(GetMainFrame()); |
+ return rfh ? rfh->browser_accessibility_manager() : NULL; |
+} |
+ |
void WebContentsImpl::UpdatePreferredSize(const gfx::Size& pref_size) { |
const gfx::Size old_size = GetPreferredSize(); |
preferred_size_ = pref_size; |
@@ -3283,6 +3357,12 @@ bool WebContentsImpl::IsNeverVisible() { |
return delegate_->IsNeverVisible(this); |
} |
+#if defined(OS_WIN) |
+gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() { |
+ return accessible_parent_; |
+} |
+#endif |
+ |
RenderViewHostDelegateView* WebContentsImpl::GetDelegateView() { |
return render_view_host_delegate_view_; |
} |