content/browser/accessibility/browser_accessibility_win.cc - Issue 329053004: Fix race in BrowserAccessibilityManagerWin creation.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 329053004: Fix race in BrowserAccessibilityManagerWin creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Simpler fix Created 6 years, 6 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

« no previous file with comments | « content/browser/accessibility/browser_accessibility_manager_win.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('j') | content/browser/renderer_host/render_widget_host_view_aura.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/accessibility/browser_accessibility_win.cc

diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc

index e98ae71498b4dde47494c28b7803ffe67476adbe..60728e01f744ddafee492258aebe3069c36cd479 100644

--- a/content/browser/accessibility/browser_accessibility_win.cc

+++ b/content/browser/accessibility/browser_accessibility_win.cc

@@ -739,6 +739,9 @@ STDMETHODIMP BrowserAccessibilityWin::get_windowHandle(HWND* window_handle) {

return E_INVALIDARG;

*window_handle = manager()->ToBrowserAccessibilityManagerWin()->parent_hwnd();

+ if (!*window_handle)

+ return E_FAIL;

return S_OK;

}

@@ -992,6 +995,8 @@ STDMETHODIMP BrowserAccessibilityWin::get_imagePosition(

if (coordinate_type == IA2_COORDTYPE_SCREEN_RELATIVE) {

HWND parent_hwnd =

manager()->ToBrowserAccessibilityManagerWin()->parent_hwnd();

+ if (!parent_hwnd)

+ return E_FAIL;

POINT top_left = {0, 0};

::ClientToScreen(parent_hwnd, &top_left);

*x = GetLocation().x() + top_left.x;