[webkit-changes] [235941] trunk/Tools

Wed, 12 Sep 2018 09:39:12 -0700

Title: [235941] trunk/Tools
Revision
235941
Author
[email protected]
Date
2018-09-12 09:37:55 -0700 (Wed, 12 Sep 2018)

Log Message

[Win][Clang][DumpRenderTree] 0 and nullptr can't be implicitly converted to AccessibilityUIElement
https://bugs.webkit.org/show_bug.cgi?id=189492

Reviewed by Alex Christensen.

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):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (235940 => 235941)


--- trunk/Tools/ChangeLog	2018-09-12 16:36:55 UTC (rev 235940)
+++ trunk/Tools/ChangeLog	2018-09-12 16:37:55 UTC (rev 235941)
@@ -1,3 +1,43 @@
+2018-09-12  Fujii Hironori  <[email protected]>
+
+        [Win][Clang][DumpRenderTree] 0 and nullptr can't be implicitly converted to AccessibilityUIElement
+        https://bugs.webkit.org/show_bug.cgi?id=189492
+
+        Reviewed by Alex Christensen.
+
+        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-11  Wenson Hsieh  <[email protected]>
 
         FontManagerTests.ChangeFontColorWithColorPanel fails on macOS Sierra

Modified: trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp (235940 => 235941)


--- trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp	2018-09-12 16:36:55 UTC (rev 235940)
+++ trunk/Tools/DumpRenderTree/AccessibilityUIElement.cpp	2018-09-12 16:37:55 UTC (rev 235941)
@@ -1561,9 +1561,9 @@
 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 @@
 
 AccessibilityUIElement AccessibilityUIElement::accessibilityElementForTextMarker(AccessibilityTextMarker*)
 {
-    return 0;
+    return { nullptr };
 }
 
 AccessibilityTextMarker AccessibilityUIElement::endTextMarkerForBounds(int x, int y, int width, int height)

Modified: trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (235940 => 235941)


--- trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp	2018-09-12 16:36:55 UTC (rev 235940)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp	2018-09-12 16:37:55 UTC (rev 235941)
@@ -67,7 +67,7 @@
 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 @@
     if (result)
         return AccessibilityUIElement(result);
 
-    return 0;
+    return { nullptr };
 }
 
 AccessibilityUIElement AccessibilityController::focusedElement()
@@ -132,7 +132,7 @@
 
     _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 @@
 {
     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 @@
     // 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;
 }

Modified: trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp (235940 => 235941)


--- trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp	2018-09-12 16:36:55 UTC (rev 235940)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityUIElementWin.cpp	2018-09-12 16:37:55 UTC (rev 235941)
@@ -133,19 +133,19 @@
 
 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 @@
     // 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 @@
 
     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::parentElement()
 {
     if (!m_element)
-        return nullptr;
+        return { nullptr };
 
     COMPtr<IDispatch> parent;
     m_element->get_accParent(&parent);
@@ -669,7 +669,7 @@
 
 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 @@
 
 AccessibilityUIElement AccessibilityUIElement::cellForColumnAndRow(unsigned column, unsigned row)
 {
-    return 0;
+    return { nullptr };
 }
 
 JSStringRef AccessibilityUIElement::selectedTextRange()
@@ -755,37 +755,37 @@
 
 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 @@
 AccessibilityUIElement AccessibilityUIElement::selectedChildAtIndex(unsigned) const
 {
     // FIXME: implement
-    return 0;
+    return { nullptr };
 }
 
 void AccessibilityUIElement::columnHeaders(Vector<AccessibilityUIElement>&) const

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to