Title: [184979] trunk/Source/WebCore
Revision
184979
Author
commit-qu...@webkit.org
Date
2015-05-28 21:53:35 -0700 (Thu, 28 May 2015)

Log Message

Replaced 0 with nullptr in WebCore/accessibility.
https://bugs.webkit.org/show_bug.cgi?id=145309

Patch by Hunseop Jeong <hs85.je...@samsung.com> on 2015-05-28
Reviewed by Chris Fleizach.

No new tests, no behavior change.

* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::mathPrescripts):
(WebCore::AccessibilityRenderObject::mathPostscripts):
* accessibility/AccessibilityScrollView.cpp:
(WebCore::AccessibilityScrollView::scrollBar):
* accessibility/atk/AXObjectCacheAtk.cpp:
(WebCore::notifyChildrenSelectionChange):
* accessibility/atk/WebKitAccessibleHyperlink.cpp:
(webkitAccessibleHyperlinkInit):
* accessibility/atk/WebKitAccessibleInterfaceDocument.cpp:
(webkitAccessibleDocumentGetAttributes):
* accessibility/atk/WebKitAccessibleInterfaceText.cpp:
(getAttributeSetForAccessibilityObject):
(attributeSetDifference):
* accessibility/atk/WebKitAccessibleUtil.h:
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(webkitAccessibleRefChild):
(webkitAccessibleGetAttributes):
(webkitAccessibleGetObjectLocale):
(getInterfaceMaskFromObject):
(objectFocusedAndCaretOffsetUnignored):
(cacheAndReturnAtkProperty):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (184978 => 184979)


--- trunk/Source/WebCore/ChangeLog	2015-05-29 04:50:59 UTC (rev 184978)
+++ trunk/Source/WebCore/ChangeLog	2015-05-29 04:53:35 UTC (rev 184979)
@@ -1,3 +1,35 @@
+2015-05-28  Hunseop Jeong  <hs85.je...@samsung.com>
+
+        Replaced 0 with nullptr in WebCore/accessibility.
+        https://bugs.webkit.org/show_bug.cgi?id=145309
+
+        Reviewed by Chris Fleizach.
+
+        No new tests, no behavior change.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::mathPrescripts):
+        (WebCore::AccessibilityRenderObject::mathPostscripts):
+        * accessibility/AccessibilityScrollView.cpp:
+        (WebCore::AccessibilityScrollView::scrollBar):
+        * accessibility/atk/AXObjectCacheAtk.cpp:
+        (WebCore::notifyChildrenSelectionChange):
+        * accessibility/atk/WebKitAccessibleHyperlink.cpp:
+        (webkitAccessibleHyperlinkInit):
+        * accessibility/atk/WebKitAccessibleInterfaceDocument.cpp:
+        (webkitAccessibleDocumentGetAttributes):
+        * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+        (getAttributeSetForAccessibilityObject):
+        (attributeSetDifference):
+        * accessibility/atk/WebKitAccessibleUtil.h:
+        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+        (webkitAccessibleRefChild):
+        (webkitAccessibleGetAttributes):
+        (webkitAccessibleGetObjectLocale):
+        (getInterfaceMaskFromObject):
+        (objectFocusedAndCaretOffsetUnignored):
+        (cacheAndReturnAtkProperty):
+
 2015-05-28  Zalan Bujtas  <za...@apple.com>
 
         Subpixel rendering: Pixel crack in text selection of simple text in <textarea>.

Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (184978 => 184979)


--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2015-05-29 04:50:59 UTC (rev 184978)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2015-05-29 04:53:35 UTC (rev 184979)
@@ -3852,8 +3852,8 @@
                 else {
                     prescriptPair.second = axChild;
                     prescripts.append(prescriptPair);
-                    prescriptPair.first = 0;
-                    prescriptPair.second = 0;
+                    prescriptPair.first = nullptr;
+                    prescriptPair.second = nullptr;
                 }
             }
         } else if (child->hasTagName(MathMLNames::mprescriptsTag))
@@ -3887,8 +3887,8 @@
             else {
                 postscriptPair.second = axChild;
                 postscripts.append(postscriptPair);
-                postscriptPair.first = 0;
-                postscriptPair.second = 0;
+                postscriptPair.first = nullptr;
+                postscriptPair.second = nullptr;
             }
         }
     }

Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp (184978 => 184979)


--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp	2015-05-29 04:50:59 UTC (rev 184978)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp	2015-05-29 04:53:35 UTC (rev 184979)
@@ -65,9 +65,9 @@
     
     switch (orientation) {
     case AccessibilityOrientationVertical:
-        return m_verticalScrollbar ? m_verticalScrollbar.get() : 0;
+        return m_verticalScrollbar ? m_verticalScrollbar.get() : nullptr;
     case AccessibilityOrientationHorizontal:
-        return m_horizontalScrollbar ? m_horizontalScrollbar.get() : 0;
+        return m_horizontalScrollbar ? m_horizontalScrollbar.get() : nullptr;
     }
     
     return nullptr;

Modified: trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp (184978 => 184979)


--- trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp	2015-05-29 04:50:59 UTC (rev 184978)
+++ trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp	2015-05-29 04:53:35 UTC (rev 184979)
@@ -168,8 +168,8 @@
     if (oldListObject.get() != listObject)
         oldFocusedObject.get() = 0;
 
-    AtkObject* axItem = item ? item->wrapper() : 0;
-    AtkObject* axOldFocusedObject = oldFocusedObject.get() ? oldFocusedObject.get()->wrapper() : 0;
+    AtkObject* axItem = item ? item->wrapper() : nullptr;
+    AtkObject* axOldFocusedObject = oldFocusedObject.get() ? oldFocusedObject.get()->wrapper() : nullptr;
 
     // Old focused object just lost focus, so emit the events.
     if (axOldFocusedObject && axItem != axOldFocusedObject) {

Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp (184978 => 184979)


--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp	2015-05-29 04:50:59 UTC (rev 184978)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp	2015-05-29 04:53:35 UTC (rev 184979)
@@ -385,7 +385,7 @@
 static void webkitAccessibleHyperlinkInit(AtkHyperlink* link)
 {
     WEBKIT_ACCESSIBLE_HYPERLINK(link)->priv = WEBKIT_ACCESSIBLE_HYPERLINK_GET_PRIVATE(link);
-    WEBKIT_ACCESSIBLE_HYPERLINK(link)->priv->hyperlinkImpl = 0;
+    WEBKIT_ACCESSIBLE_HYPERLINK(link)->priv->hyperlinkImpl = nullptr;
 }
 
 GType webkitAccessibleHyperlinkGetType()

Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.cpp (184978 => 184979)


--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.cpp	2015-05-29 04:50:59 UTC (rev 184978)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.cpp	2015-05-29 04:53:35 UTC (rev 184979)
@@ -89,7 +89,7 @@
     g_return_val_if_fail(ATK_IS_DOCUMENT(document), 0);
     returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(document), 0);
 
-    AtkAttributeSet* attributeSet = 0;
+    AtkAttributeSet* attributeSet = nullptr;
     const gchar* attributes[] = { "DocType", "Encoding", "URI" };
 
     for (unsigned i = 0; i < G_N_ELEMENTS(attributes); i++) {

Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp (184978 => 184979)


--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp	2015-05-29 04:50:59 UTC (rev 184978)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp	2015-05-29 04:53:35 UTC (rev 184979)
@@ -86,7 +86,7 @@
     RenderObject* renderer = object->renderer();
     RenderStyle* style = &renderer->style();
 
-    AtkAttributeSet* result = 0;
+    AtkAttributeSet* result = nullptr;
     GUniquePtr<gchar> buffer(g_strdup_printf("%i", style->fontSize()));
     result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_SIZE), buffer.get());
 
@@ -231,7 +231,7 @@
 
     AtkAttributeSet* currentSet = attributeSet1;
     AtkAttributeSet* found;
-    AtkAttributeSet* toDelete = 0;
+    AtkAttributeSet* toDelete = nullptr;
 
     while (currentSet) {
         found = g_slist_find_custom(attributeSet2, currentSet->data, (GCompareFunc)compareAttribute);

Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.h (184978 => 184979)


--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.h	2015-05-29 04:50:59 UTC (rev 184978)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.h	2015-05-29 04:53:35 UTC (rev 184979)
@@ -61,7 +61,7 @@
 
 AtkAttributeSet* addToAtkAttributeSet(AtkAttributeSet*, const char* name, const char* value);
 
-void contentsRelativeToAtkCoordinateType(WebCore::AccessibilityObject*, AtkCoordType, WebCore::IntRect, gint* x, gint* y, gint* width = 0, gint* height = 0);
+void contentsRelativeToAtkCoordinateType(WebCore::AccessibilityObject*, AtkCoordType, WebCore::IntRect, gint* x, gint* y, gint* width = nullptr, gint* height = nullptr);
 
 String accessibilityTitle(WebCore::AccessibilityObject*);
 

Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (184978 => 184979)


--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp	2015-05-29 04:50:59 UTC (rev 184978)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp	2015-05-29 04:53:35 UTC (rev 184979)
@@ -259,7 +259,7 @@
     }
 }
 
-static gpointer webkitAccessibleParentClass = 0;
+static gpointer webkitAccessibleParentClass = nullptr;
 
 static bool isRootObject(AccessibilityObject* coreObject)
 {
@@ -340,7 +340,7 @@
         return 0;
 
     AccessibilityObject* coreObject = core(object);
-    AccessibilityObject* coreChild = 0;
+    AccessibilityObject* coreChild = nullptr;
 
     const AccessibilityObject::AccessibilityChildrenVector& children = coreObject->children();
     if (static_cast<size_t>(index) >= children.size())
@@ -392,7 +392,7 @@
     g_return_val_if_fail(WEBKIT_IS_ACCESSIBLE(object), 0);
     returnValIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(object), 0);
 
-    AtkAttributeSet* attributeSet = 0;
+    AtkAttributeSet* attributeSet = nullptr;
 #if PLATFORM(GTK)
     attributeSet = addToAtkAttributeSet(attributeSet, "toolkit", "WebKitGtk");
 #elif PLATFORM(EFL)
@@ -919,7 +919,7 @@
             return cacheAndReturnAtkProperty(object, AtkCachedDocumentLocale, language);
 
     } else if (ATK_IS_TEXT(object)) {
-        const gchar* locale = 0;
+        const gchar* locale = nullptr;
 
         AtkAttributeSet* textAttributes = atk_text_get_default_attributes(ATK_TEXT(object));
         for (AtkAttributeSet* attributes = textAttributes; attributes; attributes = attributes->next) {
@@ -1088,7 +1088,7 @@
         interfaceMask |= 1 << WAISelection;
 
     // Get renderer if available.
-    RenderObject* renderer = 0;
+    RenderObject* renderer = nullptr;
     if (coreObject->isAccessibilityRenderObject())
         renderer = coreObject->renderer();
 
@@ -1269,7 +1269,7 @@
     if (referenceObject->isDescendantOfObject(firstUnignoredParent))
         referenceObject = firstUnignoredParent;
 
-    Node* startNode = 0;
+    Node* startNode = nullptr;
     if (firstUnignoredParent != referenceObject || firstUnignoredParent->isTextControl()) {
         // We need to use the first child's node of the reference
         // object as the start point to calculate the caret offset
@@ -1311,7 +1311,7 @@
 const char* cacheAndReturnAtkProperty(AtkObject* object, AtkCachedProperty property, String value)
 {
     WebKitAccessiblePrivate* priv = WEBKIT_ACCESSIBLE(object)->priv;
-    CString* propertyPtr = 0;
+    CString* propertyPtr = nullptr;
 
     switch (property) {
     case AtkCachedAccessibleName:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to