From f6c1f2470b243628a36981efae7c3a6ce3914a92 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Thu, 27 Nov 2008 02:12:08 +0000 Subject: Fix null dereference that happens in accessibilty because FrameView is gone during a nested message loop. I also fixed another null dereference in InitAccessibilityRoot that I saw during debugging. BUG=4582 Review URL: http://codereview.chromium.org/10418 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6098 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/glue_accessibility.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'webkit/glue/glue_accessibility.h') diff --git a/webkit/glue/glue_accessibility.h b/webkit/glue/glue_accessibility.h index 576ccc4..918e71e 100644 --- a/webkit/glue/glue_accessibility.h +++ b/webkit/glue/glue_accessibility.h @@ -35,17 +35,17 @@ class GlueAccessibility { const ViewMsg_Accessibility_In_Params& in_params, ViewHostMsg_Accessibility_Out_Params* out_params); - // Retrieves the RenderObject associated with this WebView, and uses it to - // initialize the root of the render-side MSAA tree with the associated - // accessibility information. Returns true if successful, false otherwise. - bool InitAccessibilityRoot(WebView* view); - // Erases the entry identified by the |iaccessible_id| from the hash map. If // |clear_all| is true, all entries are erased. Returns true if successful, // false otherwise. bool ClearIAccessibleMap(int iaccessible_id, bool clear_all); private: + // Retrieves the RenderObject associated with this WebView, and uses it to + // initialize the root of the render-side MSAA tree with the associated + // accessibility information. Returns true if successful, false otherwise. + bool InitAccessibilityRoot(WebView* view); + // Wrapper around the COM pointer that holds the root of the MSAA tree, to // ensure that we are not requiring WebKit includes outside of glue. struct GlueAccessibilityRoot; -- cgit v1.1