Title: [144432] trunk/Source/WebCore
Revision
144432
Author
[email protected]
Date
2013-03-01 02:13:22 -0800 (Fri, 01 Mar 2013)

Log Message

Get rid of two silly static null Strings
https://bugs.webkit.org/show_bug.cgi?id=111151

Reviewed by Eric Seidel.

We have a global null String through nullAtom, there is no need
for local static null strings.

* page/Page.cpp:
(WebCore::Page::groupName):
* rendering/RenderListItem.cpp:
(WebCore::RenderListItem::markerText):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (144431 => 144432)


--- trunk/Source/WebCore/ChangeLog	2013-03-01 10:03:57 UTC (rev 144431)
+++ trunk/Source/WebCore/ChangeLog	2013-03-01 10:13:22 UTC (rev 144432)
@@ -1,3 +1,18 @@
+2013-03-01  Benjamin Poulain  <[email protected]>
+
+        Get rid of two silly static null Strings
+        https://bugs.webkit.org/show_bug.cgi?id=111151
+
+        Reviewed by Eric Seidel.
+
+        We have a global null String through nullAtom, there is no need
+        for local static null strings.
+
+        * page/Page.cpp:
+        (WebCore::Page::groupName):
+        * rendering/RenderListItem.cpp:
+        (WebCore::RenderListItem::markerText):
+
 2013-03-01  Mark Rowe  <[email protected]>
 
         Build fix.

Modified: trunk/Source/WebCore/page/Page.cpp (144431 => 144432)


--- trunk/Source/WebCore/page/Page.cpp	2013-03-01 10:03:57 UTC (rev 144431)
+++ trunk/Source/WebCore/page/Page.cpp	2013-03-01 10:13:22 UTC (rev 144432)
@@ -438,9 +438,7 @@
 
 const String& Page::groupName() const
 {
-    DEFINE_STATIC_LOCAL(String, nullString, ());
-    // FIXME: Why not just return String()?
-    return m_group ? m_group->name() : nullString;
+    return m_group ? m_group->name() : nullAtom.string();
 }
 
 void Page::initGroup()

Modified: trunk/Source/WebCore/rendering/RenderListItem.cpp (144431 => 144432)


--- trunk/Source/WebCore/rendering/RenderListItem.cpp	2013-03-01 10:03:57 UTC (rev 144431)
+++ trunk/Source/WebCore/rendering/RenderListItem.cpp	2013-03-01 10:13:22 UTC (rev 144432)
@@ -395,8 +395,7 @@
 {
     if (m_marker)
         return m_marker->text();
-    DEFINE_STATIC_LOCAL(String, staticNullString, ());
-    return staticNullString;
+    return nullAtom.string();
 }
 
 String RenderListItem::markerTextWithSuffix() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to