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 974b033b16dee365452c484fe77988c7507bc853..0efdb3c54a9665dde4f1222bdce0bc052af8ba6b 100644 |
--- a/content/browser/accessibility/browser_accessibility_manager_win.cc |
+++ b/content/browser/accessibility/browser_accessibility_manager_win.cc |
@@ -37,13 +37,14 @@ BrowserAccessibilityManagerWin::BrowserAccessibilityManagerWin( |
BrowserAccessibilityDelegate* delegate, |
BrowserAccessibilityFactory* factory) |
: BrowserAccessibilityManager(initial_tree, delegate, factory), |
+ parent_hwnd_(NULL), |
parent_iaccessible_(parent_iaccessible), |
tracked_scroll_object_(NULL), |
accessible_hwnd_(accessible_hwnd) { |
ui::win::CreateATLModuleIfNeeded(); |
if (accessible_hwnd_) { |
accessible_hwnd_->set_browser_accessibility_manager(this); |
- parent_hwnd_ = accessible_hwnd->GetParent(); |
+ parent_hwnd_ = accessible_hwnd_->GetParent(); |
} |
} |
@@ -74,8 +75,10 @@ ui::AXTreeUpdate BrowserAccessibilityManagerWin::GetEmptyDocument() { |
void BrowserAccessibilityManagerWin::SetAccessibleHWND( |
LegacyRenderWidgetHostHWND* accessible_hwnd) { |
accessible_hwnd_ = accessible_hwnd; |
- accessible_hwnd_->set_browser_accessibility_manager(this); |
- parent_hwnd_ = accessible_hwnd->GetParent(); |
+ if (accessible_hwnd_) { |
+ accessible_hwnd_->set_browser_accessibility_manager(this); |
+ parent_hwnd_ = accessible_hwnd_->GetParent(); |
+ } |
} |
void BrowserAccessibilityManagerWin::MaybeCallNotifyWinEvent(DWORD event, |