summaryrefslogtreecommitdiff
path: root/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-08 10:28:10 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-03-20 13:40:30 +0000
commite733310db58160074f574c429d48f8308c0afe17 (patch)
treef8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
parent2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff)
downloadqtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/content/browser/accessibility/browser_accessibility_manager_win.cc')
-rw-r--r--chromium/content/browser/accessibility/browser_accessibility_manager_win.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc b/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
index 1fe2d2cc260..cdedf7a576c 100644
--- a/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
+++ b/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
@@ -118,7 +118,7 @@ void BrowserAccessibilityManagerWin::NotifyAccessibilityEvent(
if (event_type == ui::AX_EVENT_LOAD_COMPLETE && can_fire_events)
load_complete_pending_ = false;
- if (load_complete_pending_ && can_fire_events) {
+ if (load_complete_pending_ && can_fire_events && GetRoot()) {
load_complete_pending_ = false;
NotifyAccessibilityEvent(BrowserAccessibilityEvent::FromPendingLoadComplete,
ui::AX_EVENT_LOAD_COMPLETE,
@@ -128,6 +128,7 @@ void BrowserAccessibilityManagerWin::NotifyAccessibilityEvent(
if (!can_fire_events &&
!load_complete_pending_ &&
event_type == ui::AX_EVENT_LOAD_COMPLETE &&
+ GetRoot() &&
!GetRoot()->HasState(ui::AX_STATE_OFFSCREEN) &&
GetRoot()->PlatformChildCount() > 0) {
load_complete_pending_ = true;