Attachment 349513 Details for Bug 189492 – Patch

[patch] Patch

bug-189492-20180912123439.patch (text/plain), 10.63 KB, created by Fujii Hironori on 2018-09-11 20:34:40 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-09-11 20:34:40 PDT

Size: 10.63 KB

patch

obsolete

>Subversion Revision: 235925
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index c684a5e7235e2a7675672b68550d048b7598f32f..885c8b614b93fb0e613f49151eaeca804c325ba1 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,43 @@
>+2018-09-11  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][Clang][DumpRenderTree] 0 and nullptr can't be implicitly converted to AccessibilityUIElement
>+        https://bugs.webkit.org/show_bug.cgi?id=189492
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        0 and nullptr can't be implicitly converted to
>+        AccessibilityUIElement because only Windows port typedefs
>+        PlatformUIElement as COMPtr<IAccessible> not a pointer.
>+
>+        Replaced "return 0" and "return nullptr" with "return { nullptr }".
>+
>+        * DumpRenderTree/AccessibilityUIElement.cpp:
>+        (AccessibilityUIElement::horizontalScrollbar const):
>+        (AccessibilityUIElement::verticalScrollbar const):
>+        (AccessibilityUIElement::uiElementAttributeValue const):
>+        (AccessibilityUIElement::accessibilityElementForTextMarker):
>+        * DumpRenderTree/win/AccessibilityControllerWin.cpp:
>+        (AccessibilityController::elementAtPoint):
>+        (AccessibilityController::accessibleElementById):
>+        (AccessibilityController::focusedElement):
>+        (AccessibilityController::rootElement):
>+        * DumpRenderTree/win/AccessibilityUIElementWin.cpp:
>+        (AccessibilityUIElement::elementAtPoint):
>+        (AccessibilityUIElement::linkedUIElementAtIndex):
>+        (AccessibilityUIElement::getChildAtIndex):
>+        (AccessibilityUIElement::titleUIElement):
>+        (AccessibilityUIElement::parentElement):
>+        (AccessibilityUIElement::uiElementForSearchPredicate):
>+        (AccessibilityUIElement::cellForColumnAndRow):
>+        (AccessibilityUIElement::disclosedRowAtIndex):
>+        (AccessibilityUIElement::ariaOwnsElementAtIndex):
>+        (AccessibilityUIElement::ariaFlowToElementAtIndex):
>+        (AccessibilityUIElement::ariaControlsElementAtIndex):
>+        (AccessibilityUIElement::selectedRowAtIndex):
>+        (AccessibilityUIElement::rowAtIndex):
>+        (AccessibilityUIElement::disclosedByRow):
>+        (AccessibilityUIElement::selectedChildAtIndex const):
>+
> 2018-09-07  Dean Jackson  <dino@apple.com>
> 
>         Add and expose Internal features from WebKit
>diff --git a/Tools/DumpRenderTree/AccessibilityUIElement.cpp b/Tools/DumpRenderTree/AccessibilityUIElement.cpp
>index f66c133603af28ab9d21c1d1ba629f4f6ad30aa6..0d8b1595ec3c549b28b9dbc64ff69ff72f57208d 100644
>--- a/Tools/DumpRenderTree/AccessibilityUIElement.cpp
>+++ b/Tools/DumpRenderTree/AccessibilityUIElement.cpp
>@@ -1561,9 +1561,9 @@ JSStringRef AccessibilityUIElement::rangeForPosition(int, int) { return 0; }
> void AccessibilityUIElement::setSelectedChild(AccessibilityUIElement*) const { }
> void AccessibilityUIElement::setSelectedChildAtIndex(unsigned) const { }
> void AccessibilityUIElement::removeSelectionAtIndex(unsigned) const { }
>-AccessibilityUIElement AccessibilityUIElement::horizontalScrollbar() const { return 0; }
>-AccessibilityUIElement AccessibilityUIElement::verticalScrollbar() const { return 0; }
>-AccessibilityUIElement AccessibilityUIElement::uiElementAttributeValue(JSStringRef) const { return 0; }
>+AccessibilityUIElement AccessibilityUIElement::horizontalScrollbar() const { return { nullptr }; }
>+AccessibilityUIElement AccessibilityUIElement::verticalScrollbar() const { return { nullptr }; }
>+AccessibilityUIElement AccessibilityUIElement::uiElementAttributeValue(JSStringRef) const { return { nullptr }; }
> #endif
> 
> #if !PLATFORM(MAC) && !PLATFORM(IOS)
>@@ -1632,7 +1632,7 @@ AccessibilityTextMarker AccessibilityUIElement::endTextMarkerForTextMarkerRange(
> 
> AccessibilityUIElement AccessibilityUIElement::accessibilityElementForTextMarker(AccessibilityTextMarker*)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityTextMarker AccessibilityUIElement::endTextMarkerForBounds(int x, int y, int width, int height)
>diff --git a/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp b/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp
>index b98a028847dcc07854e689cd9b0228de9284b8ea..b985df66cf5c5efcba5749fca4c41922b0eb4abd 100644
>--- a/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp
>+++ b/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp
>@@ -67,7 +67,7 @@ AccessibilityController::~AccessibilityController()
> AccessibilityUIElement AccessibilityController::elementAtPoint(int x, int y)
> {
>     // FIXME: implement
>-    return 0;
>+    return { nullptr };
> }
> 
> static COMPtr<IAccessibleComparable> comparableObject(const COMPtr<IServiceProvider>& serviceProvider)
>@@ -123,7 +123,7 @@ AccessibilityUIElement AccessibilityController::accessibleElementById(JSStringRe
>     if (result)
>         return AccessibilityUIElement(result);
> 
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityUIElement AccessibilityController::focusedElement()
>@@ -132,7 +132,7 @@ AccessibilityUIElement AccessibilityController::focusedElement()
> 
>     _variant_t vFocus;
>     if (FAILED(rootAccessible->get_accFocus(&vFocus.GetVARIANT())))
>-        return nullptr;
>+        return { nullptr };
> 
>     if (V_VT(&vFocus) == VT_I4) {
>         ASSERT(V_I4(&vFocus) == CHILDID_SELF);
>@@ -149,15 +149,15 @@ AccessibilityUIElement AccessibilityController::rootElement()
> {
>     COMPtr<IWebView> view;
>     if (FAILED(frame->webView(&view)))
>-        return 0;
>+        return { nullptr };
> 
>     COMPtr<IWebViewPrivate2> viewPrivate(Query, view);
>     if (!viewPrivate)
>-        return 0;
>+        return { nullptr };
> 
>     HWND webViewWindow;
>     if (FAILED(viewPrivate->viewWindow(&webViewWindow)))
>-        return 0;
>+        return { nullptr };
> 
>     // Make sure the layout is up to date, so we can find all accessible elements.
>     COMPtr<IWebFramePrivate> framePrivate(Query, frame);
>@@ -168,7 +168,7 @@ AccessibilityUIElement AccessibilityController::rootElement()
>     // WebView's window.
>     COMPtr<IAccessible> rootAccessible;
>     if (FAILED(AccessibleObjectFromWindow(webViewWindow, static_cast<DWORD>(OBJID_CLIENT), __uuidof(IAccessible), reinterpret_cast<void**>(&rootAccessible))))
>-        return 0;
>+        return { nullptr };
> 
>     return rootAccessible;
> }
>diff --git a/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp b/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
>index 4da2269244246e31547f3ebe2a71b58582357004..a5595421f187957ad3968ae9a681dfc7429d46a0 100644
>--- a/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
>+++ b/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp
>@@ -133,19 +133,19 @@ int AccessibilityUIElement::columnCount()
> 
> AccessibilityUIElement AccessibilityUIElement::elementAtPoint(int x, int y)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityUIElement AccessibilityUIElement::linkedUIElementAtIndex(unsigned index)
> {
>     // FIXME: implement
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityUIElement AccessibilityUIElement::getChildAtIndex(unsigned index)
> {
>     if (!m_element)
>-        return nullptr;
>+        return { nullptr };
> 
>     COMPtr<IDispatch> child;
>     _variant_t vChild;
>@@ -153,7 +153,7 @@ AccessibilityUIElement AccessibilityUIElement::getChildAtIndex(unsigned index)
>     // In MSAA, index 0 is the object itself.
>     V_I4(&vChild) = index + 1;
>     if (FAILED(m_element->get_accChild(vChild.GetVARIANT(), &child)))
>-        return nullptr;
>+        return { nullptr };
>     return COMPtr<IAccessible>(Query, child);
> }
> 
>@@ -184,20 +184,20 @@ AccessibilityUIElement AccessibilityUIElement::titleUIElement()
> 
>     COMPtr<IAccessibleComparable> comparable = comparableObject(platformElement.get());
>     if (!comparable)
>-        return 0;
>+        return { nullptr };
> 
>     _variant_t value;
>     _bstr_t titleUIElementAttributeKey(L"AXTitleUIElementAttribute");
>     if (FAILED(comparable->get_attribute(titleUIElementAttributeKey, &value.GetVARIANT())))
>-        return nullptr;
>+        return { nullptr };
> 
>     if (V_VT(&value) == VT_EMPTY)
>-        return nullptr;
>+        return { nullptr };
> 
>     ASSERT(V_VT(&value) == VT_UNKNOWN);
> 
>     if (V_VT(&value) != VT_UNKNOWN)
>-        return nullptr;
>+        return { nullptr };
> 
>     COMPtr<IAccessible> titleElement(Query, value.punkVal);
> 
>@@ -207,7 +207,7 @@ AccessibilityUIElement AccessibilityUIElement::titleUIElement()
> AccessibilityUIElement AccessibilityUIElement::parentElement()
> {
>     if (!m_element)
>-        return nullptr;
>+        return { nullptr };
> 
>     COMPtr<IDispatch> parent;
>     m_element->get_accParent(&parent);
>@@ -669,7 +669,7 @@ unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef c
> 
> AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
>@@ -679,7 +679,7 @@ JSStringRef AccessibilityUIElement::selectTextWithCriteria(JSContextRef context,
> 
> AccessibilityUIElement AccessibilityUIElement::cellForColumnAndRow(unsigned column, unsigned row)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> JSStringRef AccessibilityUIElement::selectedTextRange()
>@@ -755,37 +755,37 @@ void AccessibilityUIElement::press()
> 
> AccessibilityUIElement AccessibilityUIElement::disclosedRowAtIndex(unsigned index)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityUIElement AccessibilityUIElement::ariaOwnsElementAtIndex(unsigned index)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityUIElement AccessibilityUIElement::ariaFlowToElementAtIndex(unsigned index)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityUIElement AccessibilityUIElement::ariaControlsElementAtIndex(unsigned index)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityUIElement AccessibilityUIElement::selectedRowAtIndex(unsigned index)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityUIElement AccessibilityUIElement::rowAtIndex(unsigned index)
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> AccessibilityUIElement AccessibilityUIElement::disclosedByRow()
> {
>-    return 0;
>+    return { nullptr };
> }
> 
> JSStringRef AccessibilityUIElement::accessibilityValue() const
>@@ -964,7 +964,7 @@ unsigned AccessibilityUIElement::selectedChildrenCount() const
> AccessibilityUIElement AccessibilityUIElement::selectedChildAtIndex(unsigned) const
> {
>     // FIXME: implement
>-    return 0;
>+    return { nullptr };
> }
> 
> void AccessibilityUIElement::columnHeaders(Vector<AccessibilityUIElement>&) const

Actions: View | Formatted Diff | Diff

Attachments on bug 189492: 349377 | 349509 | 349513