Title: [159287] trunk/Tools
Revision
159287
Author
[email protected]
Date
2013-11-14 08:49:29 -0800 (Thu, 14 Nov 2013)

Log Message

[ATK] Change WKTR/DRT AX methods to use nullptr
https://bugs.webkit.org/show_bug.cgi?id=124352

Patch by Krzysztof Czech <[email protected]> on 2013-11-14
Reviewed by Anders Carlsson.

Change WKTR/DRT accessibility related methods to use nullptr.

* DumpRenderTree/atk/AccessibilityControllerAtk.cpp:
(AccessibilityController::AccessibilityController):
(AccessibilityController::elementAtPoint):
(AccessibilityController::removeNotificationListener):
(AccessibilityController::childElementById):
* DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp:
(AccessibilityNotificationHandler::AccessibilityNotificationHandler):
* DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
(AccessibilityUIElement::elementAtPoint):
(AccessibilityUIElement::linkedUIElementAtIndex):
(AccessibilityUIElement::getChildAtIndex):
(AccessibilityUIElement::titleUIElement):
(AccessibilityUIElement::parentElement):
(AccessibilityUIElement::subrole):
(AccessibilityUIElement::roleDescription):
(AccessibilityUIElement::orientation):
(AccessibilityUIElement::ariaDropEffects):
(AccessibilityUIElement::uiElementForSearchPredicate):
(AccessibilityUIElement::cellForColumnAndRow):
(AccessibilityUIElement::disclosedRowAtIndex):
(AccessibilityUIElement::ariaOwnsElementAtIndex):
(AccessibilityUIElement::ariaFlowToElementAtIndex):
(AccessibilityUIElement::selectedRowAtIndex):
(AccessibilityUIElement::rowAtIndex):
(AccessibilityUIElement::disclosedByRow):
(AccessibilityUIElement::removeNotificationListener):
(AccessibilityUIElement::classList):
* WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
(WTR::AccessibilityController::logAccessibilityEvents):
(WTR::AccessibilityController::resetToConsistentState):
(WTR::childElementById):
(WTR::AccessibilityController::accessibleElementById):
(WTR::AccessibilityController::removeNotificationListener):
* WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
(WTR::AccessibilityNotificationHandler::setNotificationFunctionCallback):
(WTR::AccessibilityNotificationHandler::removeAccessibilityNotificationHandler):
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
(WTR::AccessibilityUIElement::elementAtPoint):
(WTR::AccessibilityUIElement::childAtIndex):
(WTR::AccessibilityUIElement::linkedUIElementAtIndex):
(WTR::AccessibilityUIElement::ariaOwnsElementAtIndex):
(WTR::AccessibilityUIElement::ariaFlowToElementAtIndex):
(WTR::AccessibilityUIElement::disclosedRowAtIndex):
(WTR::AccessibilityUIElement::rowAtIndex):
(WTR::AccessibilityUIElement::selectedChildAtIndex):
(WTR::AccessibilityUIElement::selectedRowAtIndex):
(WTR::AccessibilityUIElement::titleUIElement):
(WTR::AccessibilityUIElement::parentElement):
(WTR::AccessibilityUIElement::disclosedByRow):
(WTR::AccessibilityUIElement::uiElementAttributeValue):
(WTR::AccessibilityUIElement::orientation):
(WTR::AccessibilityUIElement::uiElementForSearchPredicate):
(WTR::AccessibilityUIElement::cellForColumnAndRow):
(WTR::AccessibilityUIElement::horizontalScrollbar):
(WTR::AccessibilityUIElement::verticalScrollbar):
(WTR::AccessibilityUIElement::removeNotificationListener):
(WTR::AccessibilityUIElement::textMarkerRangeForElement):
(WTR::AccessibilityUIElement::previousTextMarker):
(WTR::AccessibilityUIElement::nextTextMarker):
(WTR::AccessibilityUIElement::textMarkerRangeForMarkers):
(WTR::AccessibilityUIElement::startTextMarkerForTextMarkerRange):
(WTR::AccessibilityUIElement::endTextMarkerForTextMarkerRange):
(WTR::AccessibilityUIElement::endTextMarkerForBounds):
(WTR::AccessibilityUIElement::startTextMarkerForBounds):
(WTR::AccessibilityUIElement::textMarkerForPoint):
(WTR::AccessibilityUIElement::accessibilityElementForTextMarker):
(WTR::AccessibilityUIElement::textMarkerForIndex):
(WTR::AccessibilityUIElement::supportedActions):
(WTR::AccessibilityUIElement::pathDescription):
(WTR::AccessibilityUIElement::mathPostscriptsDescription):
(WTR::AccessibilityUIElement::mathPrescriptsDescription):
(WTR::AccessibilityUIElement::classList):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (159286 => 159287)


--- trunk/Tools/ChangeLog	2013-11-14 16:03:30 UTC (rev 159286)
+++ trunk/Tools/ChangeLog	2013-11-14 16:49:29 UTC (rev 159287)
@@ -1,3 +1,85 @@
+2013-11-14  Krzysztof Czech  <[email protected]>
+
+        [ATK] Change WKTR/DRT AX methods to use nullptr 
+        https://bugs.webkit.org/show_bug.cgi?id=124352
+
+        Reviewed by Anders Carlsson.
+
+        Change WKTR/DRT accessibility related methods to use nullptr.
+
+        * DumpRenderTree/atk/AccessibilityControllerAtk.cpp:
+        (AccessibilityController::AccessibilityController):
+        (AccessibilityController::elementAtPoint):
+        (AccessibilityController::removeNotificationListener):
+        (AccessibilityController::childElementById):
+        * DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp:
+        (AccessibilityNotificationHandler::AccessibilityNotificationHandler):
+        * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+        (AccessibilityUIElement::elementAtPoint):
+        (AccessibilityUIElement::linkedUIElementAtIndex):
+        (AccessibilityUIElement::getChildAtIndex):
+        (AccessibilityUIElement::titleUIElement):
+        (AccessibilityUIElement::parentElement):
+        (AccessibilityUIElement::subrole):
+        (AccessibilityUIElement::roleDescription):
+        (AccessibilityUIElement::orientation):
+        (AccessibilityUIElement::ariaDropEffects):
+        (AccessibilityUIElement::uiElementForSearchPredicate):
+        (AccessibilityUIElement::cellForColumnAndRow):
+        (AccessibilityUIElement::disclosedRowAtIndex):
+        (AccessibilityUIElement::ariaOwnsElementAtIndex):
+        (AccessibilityUIElement::ariaFlowToElementAtIndex):
+        (AccessibilityUIElement::selectedRowAtIndex):
+        (AccessibilityUIElement::rowAtIndex):
+        (AccessibilityUIElement::disclosedByRow):
+        (AccessibilityUIElement::removeNotificationListener):
+        (AccessibilityUIElement::classList):
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
+        (WTR::AccessibilityController::logAccessibilityEvents):
+        (WTR::AccessibilityController::resetToConsistentState):
+        (WTR::childElementById):
+        (WTR::AccessibilityController::accessibleElementById):
+        (WTR::AccessibilityController::removeNotificationListener):
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
+        (WTR::AccessibilityNotificationHandler::setNotificationFunctionCallback):
+        (WTR::AccessibilityNotificationHandler::removeAccessibilityNotificationHandler):
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+        (WTR::AccessibilityUIElement::elementAtPoint):
+        (WTR::AccessibilityUIElement::childAtIndex):
+        (WTR::AccessibilityUIElement::linkedUIElementAtIndex):
+        (WTR::AccessibilityUIElement::ariaOwnsElementAtIndex):
+        (WTR::AccessibilityUIElement::ariaFlowToElementAtIndex):
+        (WTR::AccessibilityUIElement::disclosedRowAtIndex):
+        (WTR::AccessibilityUIElement::rowAtIndex):
+        (WTR::AccessibilityUIElement::selectedChildAtIndex):
+        (WTR::AccessibilityUIElement::selectedRowAtIndex):
+        (WTR::AccessibilityUIElement::titleUIElement):
+        (WTR::AccessibilityUIElement::parentElement):
+        (WTR::AccessibilityUIElement::disclosedByRow):
+        (WTR::AccessibilityUIElement::uiElementAttributeValue):
+        (WTR::AccessibilityUIElement::orientation):
+        (WTR::AccessibilityUIElement::uiElementForSearchPredicate):
+        (WTR::AccessibilityUIElement::cellForColumnAndRow):
+        (WTR::AccessibilityUIElement::horizontalScrollbar):
+        (WTR::AccessibilityUIElement::verticalScrollbar):
+        (WTR::AccessibilityUIElement::removeNotificationListener):
+        (WTR::AccessibilityUIElement::textMarkerRangeForElement):
+        (WTR::AccessibilityUIElement::previousTextMarker):
+        (WTR::AccessibilityUIElement::nextTextMarker):
+        (WTR::AccessibilityUIElement::textMarkerRangeForMarkers):
+        (WTR::AccessibilityUIElement::startTextMarkerForTextMarkerRange):
+        (WTR::AccessibilityUIElement::endTextMarkerForTextMarkerRange):
+        (WTR::AccessibilityUIElement::endTextMarkerForBounds):
+        (WTR::AccessibilityUIElement::startTextMarkerForBounds):
+        (WTR::AccessibilityUIElement::textMarkerForPoint):
+        (WTR::AccessibilityUIElement::accessibilityElementForTextMarker):
+        (WTR::AccessibilityUIElement::textMarkerForIndex):
+        (WTR::AccessibilityUIElement::supportedActions):
+        (WTR::AccessibilityUIElement::pathDescription):
+        (WTR::AccessibilityUIElement::mathPostscriptsDescription):
+        (WTR::AccessibilityUIElement::mathPrescriptsDescription):
+        (WTR::AccessibilityUIElement::classList):
+
 2013-11-14  Éva Balázsfalvi  <[email protected]>
 
         run-perf-tests should warn loudly if you're using a Debug build.

Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityControllerAtk.cpp (159286 => 159287)


--- trunk/Tools/DumpRenderTree/atk/AccessibilityControllerAtk.cpp	2013-11-14 16:03:30 UTC (rev 159286)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityControllerAtk.cpp	2013-11-14 16:49:29 UTC (rev 159287)
@@ -38,7 +38,7 @@
 bool loggingAccessibilityEvents = false;
 
 AccessibilityController::AccessibilityController()
-    : m_globalNotificationHandler(0)
+    : m_globalNotificationHandler(nullptr)
 {
 }
 
@@ -49,7 +49,7 @@
 AccessibilityUIElement AccessibilityController::elementAtPoint(int x, int y)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 
@@ -100,13 +100,13 @@
     // Programmers should not be trying to remove a listener that's already removed.
     ASSERT(m_globalNotificationHandler);
 
-    m_globalNotificationHandler = 0;
+    m_globalNotificationHandler = nullptr;
 }
 
 AtkObject* AccessibilityController::childElementById(AtkObject* parent, const char* id)
 {
     if (!ATK_IS_OBJECT(parent))
-        return 0;
+        return nullptr;
 
     bool parentFound = false;
     AtkAttributeSet* attributeSet(atk_object_get_attributes(parent));
@@ -130,7 +130,7 @@
             return result;
     }
 
-    return 0;
+    return nullptr;
 }
 
 #endif

Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp (159286 => 159287)


--- trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp	2013-11-14 16:03:30 UTC (rev 159286)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityNotificationHandlerAtk.cpp	2013-11-14 16:49:29 UTC (rev 159287)
@@ -25,8 +25,8 @@
 #include "AccessibilityCallbacks.h"
 
 AccessibilityNotificationHandler::AccessibilityNotificationHandler(void)
-    : m_platformElement(0)
-    , m_notificationFunctionCallback(0)
+    : m_platformElement(nullptr)
+    , m_notificationFunctionCallback(nullptr)
 {
 }
 

Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (159286 => 159287)


--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp	2013-11-14 16:03:30 UTC (rev 159286)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp	2013-11-14 16:49:29 UTC (rev 159287)
@@ -126,13 +126,13 @@
 
     if (type == TextAttributeType) {
         if (!ATK_IS_TEXT(accessible))
-            return 0;
+            return nullptr;
 
         return atk_text_get_default_attributes(ATK_TEXT(accessible));
     }
 
     ASSERT_NOT_REACHED();
-    return 0;
+    return nullptr;
 }
 
 String getAttributeSetValueForId(AtkObject* accessible, AtkAttributeType type, String id)
@@ -561,7 +561,7 @@
 AccessibilityUIElement AccessibilityUIElement::elementAtPoint(int x, int y)
 {
     if (!ATK_IS_COMPONENT(m_element))
-        return 0;
+        return nullptr;
 
     GRefPtr<AtkObject> objectAtPoint = adoptGRef(atk_component_ref_accessible_at_point(ATK_COMPONENT(m_element), x, y, ATK_XY_WINDOW));
     return AccessibilityUIElement(objectAtPoint ? objectAtPoint.get() : m_element);
@@ -570,13 +570,13 @@
 AccessibilityUIElement AccessibilityUIElement::linkedUIElementAtIndex(unsigned index)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 AccessibilityUIElement AccessibilityUIElement::getChildAtIndex(unsigned index)
 {
     if (!ATK_IS_OBJECT(m_element))
-        return 0;
+        return nullptr;
 
     Vector<AccessibilityUIElement> children;
     getChildrenWithRange(children, index, index + 1);
@@ -584,7 +584,7 @@
     if (children.size() == 1)
         return children.at(0);
 
-    return 0;
+    return nullptr;
 }
 
 unsigned AccessibilityUIElement::indexOfChild(AccessibilityUIElement* element)
@@ -616,13 +616,13 @@
 AccessibilityUIElement AccessibilityUIElement::titleUIElement()
 {
     if (!ATK_IS_OBJECT(m_element))
-        return 0;
+        return nullptr;
 
     AtkRelationSet* set = atk_object_ref_relation_set(ATK_OBJECT(m_element));
     if (!set)
-        return 0;
+        return nullptr;
 
-    AtkObject* target = 0;
+    AtkObject* target = nullptr;
     int count = atk_relation_set_get_n_relations(set);
     for (int i = 0; i < count; i++) {
         AtkRelation* relation = atk_relation_set_get_relation(set, i);
@@ -634,16 +634,16 @@
     }
 
     g_object_unref(set);
-    return target ? AccessibilityUIElement(target) : 0;
+    return target ? AccessibilityUIElement(target) : nullptr;
 }
 
 AccessibilityUIElement AccessibilityUIElement::parentElement()
 {
     if (!ATK_IS_OBJECT(m_element))
-        return 0;
+        return nullptr;
 
     AtkObject* parent =  atk_object_get_parent(ATK_OBJECT(m_element));
-    return parent ? AccessibilityUIElement(parent) : 0;
+    return parent ? AccessibilityUIElement(parent) : nullptr;
 }
 
 JSStringRef AccessibilityUIElement::attributesOfChildren()
@@ -678,12 +678,12 @@
 
 JSStringRef AccessibilityUIElement::subrole()
 {
-    return 0;
+    return nullptr;
 }
 
 JSStringRef AccessibilityUIElement::roleDescription()
 {
-    return 0;
+    return nullptr;
 }
 
 JSStringRef AccessibilityUIElement::title()
@@ -821,7 +821,7 @@
     if (!ATK_IS_OBJECT(m_element))
         return JSStringCreateWithCharacters(0, 0);
 
-    const char* axOrientation = 0;
+    const char* axOrientation = nullptr;
     if (checkElementState(m_element, ATK_STATE_HORIZONTAL))
         axOrientation = "AXOrientation: AXHorizontalOrientation";
     else if (checkElementState(m_element, ATK_STATE_VERTICAL))
@@ -957,7 +957,7 @@
 
 JSStringRef AccessibilityUIElement::ariaDropEffects() const
 {   
-    return 0; 
+    return nullptr; 
 }
 
 bool AccessibilityUIElement::isExpanded() const
@@ -1090,18 +1090,18 @@
 AccessibilityUIElement AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 AccessibilityUIElement AccessibilityUIElement::cellForColumnAndRow(unsigned column, unsigned row)
 {
     if (!ATK_IS_TABLE(m_element))
-        return 0;
+        return nullptr;
 
     // Adopt the AtkObject representing the cell because
     // at_table_ref_at() transfers full ownership.
     GRefPtr<AtkObject> foundCell = adoptGRef(atk_table_ref_at(ATK_TABLE(m_element), row, column));
-    return foundCell ? AccessibilityUIElement(foundCell.get()) : 0;
+    return foundCell ? AccessibilityUIElement(foundCell.get()) : nullptr;
 }
 
 JSStringRef AccessibilityUIElement::selectedTextRange()
@@ -1216,32 +1216,32 @@
 
 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::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
@@ -1309,7 +1309,7 @@
     // Programmers should not be trying to remove a listener that's already removed.
     ASSERT(m_notificationHandler);
 
-    m_notificationHandler = 0;
+    m_notificationHandler = nullptr;
 }
 
 bool AccessibilityUIElement::isFocusable() const
@@ -1410,7 +1410,7 @@
 JSStringRef AccessibilityUIElement::classList() const
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 #endif

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp (159286 => 159287)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp	2013-11-14 16:03:30 UTC (rev 159286)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp	2013-11-14 16:49:29 UTC (rev 159287)
@@ -56,7 +56,7 @@
 
     // Ensure the Atk interface types are registered, otherwise
     // the AtkDocument signal handlers below won't get registered.
-    GObject* dummyAxObject = G_OBJECT(g_object_new(ATK_TYPE_OBJECT, 0));
+    GObject* dummyAxObject = G_OBJECT(g_object_new(ATK_TYPE_OBJECT, nullptr));
     AtkObject* dummyNoOpAxObject = atk_no_op_object_new(dummyAxObject);
     g_object_unref(G_OBJECT(dummyNoOpAxObject));
     g_object_unref(dummyAxObject);
@@ -64,13 +64,13 @@
 
 void AccessibilityController::resetToConsistentState()
 {
-    m_globalNotificationHandler = 0;
+    m_globalNotificationHandler = nullptr;
 }
 
 static AtkObject* childElementById(AtkObject* parent, const char* id)
 {
     if (!ATK_IS_OBJECT(parent))
-        return 0;
+        return nullptr;
 
     bool parentFound = false;
     AtkAttributeSet* attributeSet = atk_object_get_attributes(parent);
@@ -94,14 +94,14 @@
             return result;
     }
 
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityController::accessibleElementById(JSStringRef id)
 {
     AtkObject* root = ATK_OBJECT(WKAccessibilityRootObject(InjectedBundle::shared().page()->page()));
     if (!root)
-        return 0;
+        return nullptr;
 
     size_t bufferSize = JSStringGetMaximumUTF8CStringSize(id);
     GOwnPtr<gchar> idBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
@@ -111,7 +111,7 @@
     if (ATK_IS_OBJECT(result))
         return AccessibilityUIElement::create(result);
 
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement()
@@ -148,7 +148,7 @@
     // Programmers should not be trying to remove a listener that's already removed.
     ASSERT(m_globalNotificationHandler);
 
-    m_globalNotificationHandler = 0;
+    m_globalNotificationHandler = nullptr;
     return false;
 }
 

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp (159286 => 159287)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp	2013-11-14 16:03:30 UTC (rev 159286)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp	2013-11-14 16:49:29 UTC (rev 159287)
@@ -47,7 +47,7 @@
 unsigned visibleDataChangedListenerId = 0;
 unsigned loadCompleteListenerId = 0;
 NotificationHandlersMap notificationHandlers;
-AccessibilityNotificationHandler* globalNotificationHandler = 0;
+AccessibilityNotificationHandler* globalNotificationHandler = nullptr;
 bool loggingAccessibilityEvents = false;
 
 void printAccessibilityEvent(AtkObject* accessible, const char* signalName, const char* signalValue)
@@ -85,7 +85,7 @@
     GSignalQuery signalQuery;
     GOwnPtr<char> signalName;
     GOwnPtr<char> signalValue;
-    const char* notificationName = 0;
+    const char* notificationName = nullptr;
 
     g_signal_query(signalHint->signal_id, &signalQuery);
 
@@ -121,7 +121,7 @@
     WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
     JSContextRef jsContext = WKBundleFrameGetJavaScriptContext(mainFrame);
 #else
-    JSContextRef jsContext = 0;
+    JSContextRef jsContext = nullptr;
 #endif
     if (!jsContext)
         return true;
@@ -182,7 +182,7 @@
     WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
     JSContextRef jsContext = WKBundleFrameGetJavaScriptContext(mainFrame);
 #else
-    JSContextRef jsContext = 0;
+    JSContextRef jsContext = nullptr;
 #endif
     if (!jsContext)
         return;
@@ -213,14 +213,14 @@
     WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(page);
     JSContextRef jsContext = WKBundleFrameGetJavaScriptContext(mainFrame);
 #else
-    JSContextRef jsContext = 0;
+    JSContextRef jsContext = nullptr;
 #endif
     if (!jsContext)
         return;
 
     if (globalNotificationHandler == this) {
         JSValueUnprotect(jsContext, globalNotificationHandler->notificationFunctionCallback());
-        globalNotificationHandler = 0;
+        globalNotificationHandler = nullptr;
     } else if (m_platformElement.get()) {
         NotificationHandlersMap::iterator removeNotificationHandler = notificationHandlers.find(m_platformElement.get());
         if (removeNotificationHandler != notificationHandlers.end()) {

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (159286 => 159287)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp	2013-11-14 16:03:30 UTC (rev 159286)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp	2013-11-14 16:49:29 UTC (rev 159287)
@@ -130,13 +130,13 @@
 
     if (type == TextAttributeType) {
         if (!ATK_IS_TEXT(accessible))
-            return 0;
+            return nullptr;
 
         return atk_text_get_default_attributes(ATK_TEXT(accessible));
     }
 
     ASSERT_NOT_REACHED();
-    return 0;
+    return nullptr;
 }
 
 String getAttributeSetValueForId(AtkObject* accessible, AtkAttributeType type, String id)
@@ -387,7 +387,7 @@
     // For the parent we print its role and its name, if available.
     builder.append("AXParent: ");
     RefPtr<AccessibilityUIElement> parent = element->parentElement();
-    AtkObject* atkParent = parent ? parent->platformUIElement().get() : 0;
+    AtkObject* atkParent = parent ? parent->platformUIElement().get() : nullptr;
     if (atkParent) {
         builder.append(roleToString(atk_object_get_role(atkParent)));
         const char* parentName = atk_object_get_name(atkParent);
@@ -540,7 +540,7 @@
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::elementAtPoint(int x, int y)
 {
     if (!ATK_IS_COMPONENT(m_element.get()))
-        return 0;
+        return nullptr;
 
     GRefPtr<AtkObject> objectAtPoint = adoptGRef(atk_component_ref_accessible_at_point(ATK_COMPONENT(m_element.get()), x, y, ATK_XY_WINDOW));
     return AccessibilityUIElement::create(objectAtPoint ? objectAtPoint.get() : m_element.get());
@@ -565,7 +565,7 @@
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::childAtIndex(unsigned index)
 {
     if (!ATK_IS_OBJECT(m_element.get()))
-        return 0;
+        return nullptr;
 
     Vector<RefPtr<AccessibilityUIElement> > children;
     getChildrenWithRange(children, index, 1);
@@ -573,43 +573,43 @@
     if (children.size() == 1)
         return children[0];
 
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::linkedUIElementAtIndex(unsigned index)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaOwnsElementAtIndex(unsigned index)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaFlowToElementAtIndex(unsigned index)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::disclosedRowAtIndex(unsigned index)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::rowAtIndex(unsigned index)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::selectedChildAtIndex(unsigned index) const
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 unsigned AccessibilityUIElement::selectedChildrenCount() const
@@ -621,19 +621,19 @@
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::selectedRowAtIndex(unsigned index)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::titleUIElement()
 {
     if (!ATK_IS_OBJECT(m_element.get()))
-        return 0;
+        return nullptr;
 
     AtkRelationSet* set = atk_object_ref_relation_set(ATK_OBJECT(m_element.get()));
     if (!set)
-        return 0;
+        return nullptr;
 
-    AtkObject* target = 0;
+    AtkObject* target = nullptr;
     int count = atk_relation_set_get_n_relations(set);
     for (int i = 0; i < count; i++) {
         AtkRelation* relation = atk_relation_set_get_relation(set, i);
@@ -645,22 +645,22 @@
     }
 
     g_object_unref(set);
-    return target ? AccessibilityUIElement::create(target) : 0;
+    return target ? AccessibilityUIElement::create(target) : nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::parentElement()
 {
     if (!ATK_IS_OBJECT(m_element.get()))
-        return 0;
+        return nullptr;
 
     AtkObject* parent = atk_object_get_parent(ATK_OBJECT(m_element.get()));
-    return parent ? AccessibilityUIElement::create(parent) : 0;
+    return parent ? AccessibilityUIElement::create(parent) : nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::disclosedByRow()
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 JSRetainPtr<JSStringRef> AccessibilityUIElement::attributesOfLinkedUIElements()
@@ -734,7 +734,7 @@
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementAttributeValue(JSStringRef attribute) const
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 bool AccessibilityUIElement::boolAttributeValue(JSStringRef attribute)
@@ -827,7 +827,7 @@
     if (!ATK_IS_OBJECT(m_element.get()))
         return JSStringCreateWithCharacters(0, 0);
 
-    const gchar* axOrientation = 0;
+    const gchar* axOrientation = nullptr;
     if (checkElementState(m_element.get(), ATK_STATE_HORIZONTAL))
         axOrientation = "AXOrientation: AXHorizontalOrientation";
     else if (checkElementState(m_element.get(), ATK_STATE_VERTICAL))
@@ -1138,7 +1138,7 @@
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 JSRetainPtr<JSStringRef> AccessibilityUIElement::attributesOfColumnHeaders()
@@ -1223,24 +1223,24 @@
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::cellForColumnAndRow(unsigned col, unsigned row)
 {
     if (!ATK_IS_TABLE(m_element.get()))
-        return 0;
+        return nullptr;
 
     // Adopt the AtkObject representing the cell because
     // at_table_ref_at() transfers full ownership.
     GRefPtr<AtkObject> foundCell = adoptGRef(atk_table_ref_at(ATK_TABLE(m_element.get()), row, col));
-    return foundCell ? AccessibilityUIElement::create(foundCell.get()) : 0;
+    return foundCell ? AccessibilityUIElement::create(foundCell.get()) : nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::horizontalScrollbar() const
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::verticalScrollbar() const
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 JSRetainPtr<JSStringRef> AccessibilityUIElement::selectedTextRange()
@@ -1356,7 +1356,7 @@
 {
     // Programmers should not be trying to remove a listener that's already removed.
     ASSERT(m_notificationHandler);
-    m_notificationHandler = 0;
+    m_notificationHandler = nullptr;
 
     return true;
 }
@@ -1432,7 +1432,7 @@
 PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::textMarkerRangeForElement(AccessibilityUIElement* element)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 int AccessibilityUIElement::textMarkerRangeLength(AccessibilityTextMarkerRange* range)
@@ -1444,13 +1444,13 @@
 PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::previousTextMarker(AccessibilityTextMarker* textMarker)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::nextTextMarker(AccessibilityTextMarker* textMarker)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 JSRetainPtr<JSStringRef> AccessibilityUIElement::stringForTextMarkerRange(AccessibilityTextMarkerRange* markerRange)
@@ -1462,43 +1462,43 @@
 PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::textMarkerRangeForMarkers(AccessibilityTextMarker* startMarker, AccessibilityTextMarker* endMarker)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::startTextMarkerForTextMarkerRange(AccessibilityTextMarkerRange* range)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::endTextMarkerForTextMarkerRange(AccessibilityTextMarkerRange* range)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::endTextMarkerForBounds(int x, int y, int width, int height)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::startTextMarkerForBounds(int x, int y, int width, int height)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::textMarkerForPoint(int x, int y)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::accessibilityElementForTextMarker(AccessibilityTextMarker* marker)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 bool AccessibilityUIElement::attributedStringForTextMarkerRangeContainsAttribute(JSStringRef attribute, AccessibilityTextMarkerRange* range)
@@ -1522,7 +1522,7 @@
 PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::textMarkerForIndex(int textIndex)
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
     
 PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::startTextMarker()
@@ -1545,31 +1545,31 @@
 JSRetainPtr<JSStringRef> AccessibilityUIElement::supportedActions() const
 {
     // FIXME: implement
-    return 0;
+    return nullptr;
 }
 
 JSRetainPtr<JSStringRef> AccessibilityUIElement::pathDescription() const
 {
     notImplemented();
-    return 0;
+    return nullptr;
 }
 
 JSRetainPtr<JSStringRef> AccessibilityUIElement::mathPostscriptsDescription() const
 {
     notImplemented();
-    return 0;
+    return nullptr;
 }
 
 JSRetainPtr<JSStringRef> AccessibilityUIElement::mathPrescriptsDescription() const
 {
     notImplemented();
-    return 0;
+    return nullptr;
 }
 
 JSRetainPtr<JSStringRef> AccessibilityUIElement::classList() const
 {
     notImplemented();
-    return 0;
+    return nullptr;
 }
 
 } // namespace WTR
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to