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

Unified Diff: content/browser/accessibility/browser_accessibility_manager_win.cc

Issue 387353004: Create only a single LegacyRenderWidgetHostHWND per WebContentsViewAura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@render_frame_ax_3
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/accessibility/browser_accessibility_manager_win.cc
diff --git a/content/browser/accessibility/browser_accessibility_manager_win.cc b/content/browser/accessibility/browser_accessibility_manager_win.cc
index 05e2fd507e8c73f420260a6afdd5fb419948c956..aafba06118e6ab4cd59d653615a984830953418e 100644
--- a/content/browser/accessibility/browser_accessibility_manager_win.cc
+++ b/content/browser/accessibility/browser_accessibility_manager_win.cc
@@ -21,8 +21,7 @@ BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
BrowserAccessibilityDelegate* delegate,
BrowserAccessibilityFactory* factory) {
return new BrowserAccessibilityManagerWin(
- content::LegacyRenderWidgetHostHWND::Create(GetDesktopWindow()),
- NULL, initial_tree, delegate, factory);
+ NULL, NULL, initial_tree, delegate, factory);
}
BrowserAccessibilityManagerWin*
@@ -43,10 +42,9 @@ BrowserAccessibilityManagerWin::BrowserAccessibilityManagerWin(
accessible_hwnd_(accessible_hwnd),
focus_event_on_root_needed_(false) {
ui::win::CreateATLModuleIfNeeded();
- if (accessible_hwnd_) {
- accessible_hwnd_->set_browser_accessibility_manager(this);
- parent_hwnd_ = accessible_hwnd_->GetParent();
- }
+ if (!accessible_hwnd_)
+ accessible_hwnd_ = LegacyRenderWidgetHostHWND::CreateForTesting(this);
+ parent_hwnd_ = accessible_hwnd_->GetParent();
}
BrowserAccessibilityManagerWin::~BrowserAccessibilityManagerWin() {
@@ -54,8 +52,6 @@ BrowserAccessibilityManagerWin::~BrowserAccessibilityManagerWin() {
tracked_scroll_object_->Release();
tracked_scroll_object_ = NULL;
}
- if (accessible_hwnd_)
- accessible_hwnd_->OnManagerDeleted(this);
}
// static
@@ -73,19 +69,6 @@ ui::AXTreeUpdate BrowserAccessibilityManagerWin::GetEmptyDocument() {
return update;
}
-void BrowserAccessibilityManagerWin::SetAccessibleHWND(
- LegacyRenderWidgetHostHWND* accessible_hwnd) {
- if (accessible_hwnd_)
- accessible_hwnd_->OnManagerDeleted(this);
-
- accessible_hwnd_ = accessible_hwnd;
-
- if (accessible_hwnd_) {
- accessible_hwnd_->set_browser_accessibility_manager(this);
- parent_hwnd_ = accessible_hwnd_->GetParent();
- }
-}
-
void BrowserAccessibilityManagerWin::MaybeCallNotifyWinEvent(DWORD event,
LONG child_id) {
// If on Win 7 and complete accessibility is enabled, use the fake child HWND

Powered by Google App Engine
This is Rietveld 408576698