Attachment 349509 Details for Bug 189492 – WIP patch

[patch] WIP patch

wip.diff (text/plain), 5.87 KB, created by Fujii Hironori on 2018-09-11 20:06:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-11 20:06:32 PDT

Size: 5.87 KB

patch

obsolete

>diff --git a/Tools/DumpRenderTree/AccessibilityUIElement.h b/Tools/DumpRenderTree/AccessibilityUIElement.h
>index 634ce8a8e411..81baba69e80d 100644
>--- a/Tools/DumpRenderTree/AccessibilityUIElement.h
>+++ b/Tools/DumpRenderTree/AccessibilityUIElement.h
>@@ -41,10 +41,9 @@ typedef struct objc_object* PlatformUIElement;
> #undef _WINSOCKAPI_
> #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
> 
>-#include <WebCore/COMPtr.h>
> #include <oleacc.h>
> 
>-typedef COMPtr<IAccessible> PlatformUIElement;
>+using PlatformUIElement = IAccessible*;
> #elif HAVE(ACCESSIBILITY) && PLATFORM(GTK)
> #include "AccessibilityNotificationHandlerAtk.h"
> #include <atk/atk.h>
>diff --git a/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp b/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp
>index b98a028847dc..f6538cf307e3 100644
>--- a/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp
>+++ b/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp
>@@ -121,7 +121,7 @@ AccessibilityUIElement AccessibilityController::accessibleElementById(JSStringRe
> 
>     COMPtr<IAccessible> result = findAccessibleObjectById(rootAccessibilityUIElement, idAttribute);
>     if (result)
>-        return AccessibilityUIElement(result);
>+        return AccessibilityUIElement(result.get());
> 
>     return 0;
> }
>@@ -137,12 +137,12 @@ AccessibilityUIElement AccessibilityController::focusedElement()
>     if (V_VT(&vFocus) == VT_I4) {
>         ASSERT(V_I4(&vFocus) == CHILDID_SELF);
>         // The root accessible object is the focused object.
>-        return rootAccessible;
>+        return rootAccessible.get();
>     }
> 
>     ASSERT(V_VT(&vFocus) == VT_DISPATCH);
>     // We have an IDispatch; query for IAccessible.
>-    return COMPtr<IAccessible>(Query, V_DISPATCH(&vFocus));
>+    return COMPtr<IAccessible>(Query, V_DISPATCH(&vFocus)).get();
> }
> 
> AccessibilityUIElement AccessibilityController::rootElement()
>@@ -170,7 +170,7 @@ AccessibilityUIElement AccessibilityController::rootElement()
>     if (FAILED(AccessibleObjectFromWindow(webViewWindow, static_cast<DWORD>(OBJID_CLIENT), __uuidof(IAccessible), reinterpret_cast<void**>(&rootAccessible))))
>         return 0;
> 
>-    return rootAccessible;
>+    return rootAccessible.get();
> }
> 
> static void CALLBACK logEventProc(HWINEVENTHOOK, DWORD event, HWND hwnd, LONG idObject, LONG idChild, DWORD, DWORD)
>@@ -327,7 +327,7 @@ static void CALLBACK notificationListenerProc(HWINEVENTHOOK, DWORD event, HWND h
>         return;
> 
>     COMPtr<IAccessible> childAccessible(Query, childDispatch);
>-    sharedFrameLoadDelegate->accessibilityController()->winNotificationReceived(childAccessible, stringEvent(event));
>+    sharedFrameLoadDelegate->accessibilityController()->winNotificationReceived(childAccessible.get(), stringEvent(event));
> }
> 
> bool AccessibilityController::addNotificationListener(JSObjectRef functionCallback)
>diff --git a/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp b/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
>index 4da226924424..c8e4c03dc86f 100644
>--- a/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
>+++ b/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
>@@ -51,21 +51,24 @@ static COMPtr<IAccessibleComparable> comparableObject(IAccessible* accessible)
> AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement element)
>     : m_element(element)
> {
>+    m_element->AddRef();
> }
> 
> AccessibilityUIElement::AccessibilityUIElement(const AccessibilityUIElement& other)
>     : m_element(other.m_element)
> {
>+    m_element->AddRef();
> }
> 
> AccessibilityUIElement::~AccessibilityUIElement()
> {
>+    m_element->Release();
> }
> 
> bool AccessibilityUIElement::isEqual(AccessibilityUIElement* otherElement)
> {
>-    COMPtr<IAccessibleComparable> comparable = comparableObject(m_element.get());
>-    COMPtr<IAccessibleComparable> otherComparable = comparableObject(otherElement->m_element.get());
>+    COMPtr<IAccessibleComparable> comparable = comparableObject(m_element);
>+    COMPtr<IAccessibleComparable> otherComparable = comparableObject(otherElement->m_element);
>     if (!comparable || !otherComparable)
>         return false;
>     BOOL isSame = FALSE;
>@@ -154,7 +157,7 @@ AccessibilityUIElement AccessibilityUIElement::getChildAtIndex(unsigned index)
>     V_I4(&vChild) = index + 1;
>     if (FAILED(m_element->get_accChild(vChild.GetVARIANT(), &child)))
>         return nullptr;
>-    return COMPtr<IAccessible>(Query, child);
>+    return COMPtr<IAccessible>(Query, child).get();
> }
> 
> unsigned AccessibilityUIElement::indexOfChild(AccessibilityUIElement* element)
>@@ -201,7 +204,7 @@ AccessibilityUIElement AccessibilityUIElement::titleUIElement()
> 
>     COMPtr<IAccessible> titleElement(Query, value.punkVal);
> 
>-    return titleElement;
>+    return titleElement.get();
> }
> 
> AccessibilityUIElement AccessibilityUIElement::parentElement()
>@@ -213,7 +216,7 @@ AccessibilityUIElement AccessibilityUIElement::parentElement()
>     m_element->get_accParent(&parent);
> 
>     COMPtr<IAccessible> parentAccessible(Query, parent);
>-    return parentAccessible;
>+    return parentAccessible.get();
> }
> 
> JSStringRef AccessibilityUIElement::attributesOfChildren()
>@@ -377,7 +380,7 @@ JSStringRef AccessibilityUIElement::language()
>     if (!m_element)
>         return JSStringCreateWithBSTR(_bstr_t(L"AXLanguage: "));
> 
>-    COMPtr<IAccessibleComparable> accessible2Element = comparableObject(m_element.get());
>+    COMPtr<IAccessibleComparable> accessible2Element = comparableObject(m_element);
>     if (!accessible2Element)
>         return JSStringCreateWithBSTR(_bstr_t(L"AXLanguage: "));
> 
>@@ -684,7 +687,7 @@ AccessibilityUIElement AccessibilityUIElement::cellForColumnAndRow(unsigned colu
> 
> JSStringRef AccessibilityUIElement::selectedTextRange()
> {
>-    COMPtr<IAccessibleComparable> comparable = comparableObject(platformUIElement().get());
>+    COMPtr<IAccessibleComparable> comparable = comparableObject(platformUIElement());
>     if (!comparable)
>         return JSStringCreateWithCharacters(0, 0);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189492: 349377 | 349509 | 349513