Changeset 154343 in webkit

Timestamp:

Aug 20, 2013 11:13:05 AM (11 years ago)

Author:

dbates@webkit.org

Message:

<​https://webkit.org/b/120072> Use nullAtom instead of defining static local in
Accessibility{Object, RenderObject}::actionVerb()

Reviewed by Chris Fleizach.

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::actionVerb):

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::actionVerb):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityObject.cpp (modified) (2 diffs)
• accessibility/AccessibilityRenderObject.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-20  Daniel Bates  <dabates@apple.com>
+
+        <https://webkit.org/b/120072> Use nullAtom instead of defining static local in
+        Accessibility{Object, RenderObject}::actionVerb()
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::actionVerb):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::actionVerb):
+
 2013-08-20  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -1303 +1303 @@
     DEFINE_STATIC_LOCAL(const String, menuListPopupAction, (AXMenuListPopupActionVerb()));
     DEFINE_STATIC_LOCAL(const String, listItemAction, (AXListItemActionVerb()));
-    DEFINE_STATIC_LOCAL(const String, noAction, ());
 
     switch (roleValue()) {
@@ -1326 +1325 @@
         return listItemAction;
     default:
-        return noAction;
+        return nullAtom;
     }
 #else
-    DEFINE_STATIC_LOCAL(const String, noAction, ());
-    return noAction;
+    return nullAtom;
 #endif
 }

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -3152 +3152 @@
     DEFINE_STATIC_LOCAL(const String, uncheckedCheckBoxAction, (AXUncheckedCheckBoxActionVerb()));
     DEFINE_STATIC_LOCAL(const String, linkAction, (AXLinkActionVerb()));
-    DEFINE_STATIC_LOCAL(const String, noAction, ());
-    
+
     switch (roleValue()) {
     case ButtonRole:
@@ -3169 +3168 @@
         return linkAction;
     default:
-        return noAction;
+        return nullAtom;
     }
 #else
-    DEFINE_STATIC_LOCAL(const String, noAction, ());
-    return noAction;
+    return nullAtom;
 #endif
 }