From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp') diff --git a/WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp b/WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp index 255bfc3..f03c102 100644 --- a/WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp +++ b/WebKitTools/DumpRenderTree/win/AccessibilityControllerWin.cpp @@ -232,7 +232,8 @@ static void CALLBACK notificationListenerProc(HWINEVENTHOOK, DWORD event, HWND h VariantInit(&vChild); HRESULT hr = AccessibleObjectFromEvent(hwnd, idObject, idChild, &parentObject, &vChild); - ASSERT(SUCCEEDED(hr)); + if (FAILED(hr) || !parentObject) + return; COMPtr childDispatch; if (FAILED(parentObject->get_accChild(vChild, &childDispatch))) { -- cgit v1.1