diff options
| author | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 00:47:16 +0000 |
|---|---|---|
| committer | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 00:47:16 +0000 |
| commit | c74baf1d5207dd48805c945045a26789ae52944c (patch) | |
| tree | 40c3b3caae6aaea6c1a0a3ceae7869e603d6e8fa /content/browser | |
| parent | 9071a3c878cc4abfed05e29791c92af75ada72a8 (diff) | |
| download | chromium_src-c74baf1d5207dd48805c945045a26789ae52944c.zip chromium_src-c74baf1d5207dd48805c945045a26789ae52944c.tar.gz chromium_src-c74baf1d5207dd48805c945045a26789ae52944c.tar.bz2 | |
Fix BrowserAccessibilityWin::QueryService to use the service guid rather than the interface id to resolve interfaces.
Jaws passes the IAccessible* guid as the service interface (and not the riid), so this logic needs to revert back to the way it was; otherwise, Jaws ends up with an empty buffer when it attempts to traverse the IAccessible tree.
(Result of https://chromiumcodereview.appspot.com/9958139)
BUG=none
TEST=manual.
Review URL: http://codereview.chromium.org/10246002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/accessibility/browser_accessibility_win.cc | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc index 008c4a4..cec078d 100644 --- a/content/browser/accessibility/browser_accessibility_win.cc +++ b/content/browser/accessibility/browser_accessibility_win.cc @@ -2517,21 +2517,21 @@ STDMETHODIMP BrowserAccessibilityWin::QueryService( if (!instance_active_) return E_FAIL; - if (riid == IID_IAccessible || - riid == IID_IAccessible2 || - riid == IID_IAccessibleAction || - riid == IID_IAccessibleHyperlink || - riid == IID_IAccessibleHypertext || - riid == IID_IAccessibleImage || - riid == IID_IAccessibleTable || - riid == IID_IAccessibleTable2 || - riid == IID_IAccessibleTableCell || - riid == IID_IAccessibleText || - riid == IID_IAccessibleValue || - riid == IID_ISimpleDOMDocument || - riid == IID_ISimpleDOMNode || - riid == IID_ISimpleDOMText || - riid == GUID_ISimpleDOM) { + if (guidService == IID_IAccessible || + guidService == IID_IAccessible2 || + guidService == IID_IAccessibleAction || + guidService == IID_IAccessibleHyperlink || + guidService == IID_IAccessibleHypertext || + guidService == IID_IAccessibleImage || + guidService == IID_IAccessibleTable || + guidService == IID_IAccessibleTable2 || + guidService == IID_IAccessibleTableCell || + guidService == IID_IAccessibleText || + guidService == IID_IAccessibleValue || + guidService == IID_ISimpleDOMDocument || + guidService == IID_ISimpleDOMNode || + guidService == IID_ISimpleDOMText || + guidService == GUID_ISimpleDOM) { return QueryInterface(riid, object); } |