Title: [154343] trunk/Source/WebCore
- Revision
- 154343
- Author
- [email protected]
- Date
- 2013-08-20 11:13:05 -0700 (Tue, 20 Aug 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154342 => 154343)
--- trunk/Source/WebCore/ChangeLog 2013-08-20 18:12:22 UTC (rev 154342)
+++ trunk/Source/WebCore/ChangeLog 2013-08-20 18:13:05 UTC (rev 154343)
@@ -1,5 +1,17 @@
2013-08-20 Daniel Bates <[email protected]>
+ <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 <[email protected]>
+
<https://webkit.org/b/119914> [iOS] Upstream changes to WebCore/accessibility
Reviewed by Darin Adler and Chris Fleizach.
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (154342 => 154343)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-08-20 18:12:22 UTC (rev 154342)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-08-20 18:13:05 UTC (rev 154343)
@@ -1302,7 +1302,6 @@
DEFINE_STATIC_LOCAL(const String, menuListAction, (AXMenuListActionVerb()));
DEFINE_STATIC_LOCAL(const String, menuListPopupAction, (AXMenuListPopupActionVerb()));
DEFINE_STATIC_LOCAL(const String, listItemAction, (AXListItemActionVerb()));
- DEFINE_STATIC_LOCAL(const String, noAction, ());
switch (roleValue()) {
case ButtonRole:
@@ -1325,11 +1324,10 @@
case ListItemRole:
return listItemAction;
default:
- return noAction;
+ return nullAtom;
}
#else
- DEFINE_STATIC_LOCAL(const String, noAction, ());
- return noAction;
+ return nullAtom;
#endif
}
#endif
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (154342 => 154343)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-08-20 18:12:22 UTC (rev 154342)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-08-20 18:13:05 UTC (rev 154343)
@@ -3151,8 +3151,7 @@
DEFINE_STATIC_LOCAL(const String, checkedCheckBoxAction, (AXCheckedCheckBoxActionVerb()));
DEFINE_STATIC_LOCAL(const String, uncheckedCheckBoxAction, (AXUncheckedCheckBoxActionVerb()));
DEFINE_STATIC_LOCAL(const String, linkAction, (AXLinkActionVerb()));
- DEFINE_STATIC_LOCAL(const String, noAction, ());
-
+
switch (roleValue()) {
case ButtonRole:
case ToggleButtonRole:
@@ -3168,11 +3167,10 @@
case WebCoreLinkRole:
return linkAction;
default:
- return noAction;
+ return nullAtom;
}
#else
- DEFINE_STATIC_LOCAL(const String, noAction, ());
- return noAction;
+ return nullAtom;
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
