[webkit-changes] [149332] trunk/Source/WebKit2

Mon, 29 Apr 2013 16:55:30 -0700

Title: [149332] trunk/Source/WebKit2
Revision
149332
Author
[email protected]
Date
2013-04-29 16:56:53 -0700 (Mon, 29 Apr 2013)

Log Message

[WK2] Streamline the use of strings in WebProcess::getWebCoreStatistics
https://bugs.webkit.org/show_bug.cgi?id=115315

Reviewed by Geoffrey Garen.

Remove a couple of unjustified DEFINE_STATIC_LOCAL.
Use ASCIILiteral when allocating new String.

* WebProcess/WebProcess.cpp:
(WebKit::getWebCoreMemoryCacheStatistics):
(WebKit::WebProcess::getWebCoreStatistics):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (149331 => 149332)


--- trunk/Source/WebKit2/ChangeLog	2013-04-29 23:54:32 UTC (rev 149331)
+++ trunk/Source/WebKit2/ChangeLog	2013-04-29 23:56:53 UTC (rev 149332)
@@ -1,3 +1,17 @@
+2013-04-29  Benjamin Poulain  <[email protected]>
+
+        [WK2] Streamline the use of strings in WebProcess::getWebCoreStatistics
+        https://bugs.webkit.org/show_bug.cgi?id=115315
+
+        Reviewed by Geoffrey Garen.
+
+        Remove a couple of unjustified DEFINE_STATIC_LOCAL.
+        Use ASCIILiteral when allocating new String.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::getWebCoreMemoryCacheStatistics):
+        (WebKit::WebProcess::getWebCoreStatistics):
+
 2013-04-29  Anders Carlsson  <[email protected]>
 
         Remove StorageTracker::originsLoaded

Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (149331 => 149332)


--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp	2013-04-29 23:54:32 UTC (rev 149331)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp	2013-04-29 23:56:53 UTC (rev 149332)
@@ -888,10 +888,10 @@
 
 static void getWebCoreMemoryCacheStatistics(Vector<HashMap<String, uint64_t> >& result)
 {
-    DEFINE_STATIC_LOCAL(String, imagesString, (ASCIILiteral("Images")));
-    DEFINE_STATIC_LOCAL(String, cssString, (ASCIILiteral("CSS")));
-    DEFINE_STATIC_LOCAL(String, xslString, (ASCIILiteral("XSL")));
-    DEFINE_STATIC_LOCAL(String, _javascript_String, (ASCIILiteral("_javascript_")));
+    String imagesString(ASCIILiteral("Images"));
+    String cssString(ASCIILiteral("CSS"));
+    String xslString(ASCIILiteral("XSL"));
+    String _javascript_String(ASCIILiteral("_javascript_"));
     
     MemoryCache::Statistics memoryCacheStatistics = memoryCache()->getStatistics();
     
@@ -945,10 +945,10 @@
     // Gather _javascript_ statistics.
     {
         JSLockHolder lock(JSDOMWindow::commonVM());
-        data.statisticsNumbers.set("_javascript_ObjectsCount", JSDOMWindow::commonVM()->heap.objectCount());
-        data.statisticsNumbers.set("_javascript_GlobalObjectsCount", JSDOMWindow::commonVM()->heap.globalObjectCount());
-        data.statisticsNumbers.set("_javascript_ProtectedObjectsCount", JSDOMWindow::commonVM()->heap.protectedObjectCount());
-        data.statisticsNumbers.set("_javascript_ProtectedGlobalObjectsCount", JSDOMWindow::commonVM()->heap.protectedGlobalObjectCount());
+        data.statisticsNumbers.set(ASCIILiteral("_javascript_ObjectsCount"), JSDOMWindow::commonVM()->heap.objectCount());
+        data.statisticsNumbers.set(ASCIILiteral("_javascript_GlobalObjectsCount"), JSDOMWindow::commonVM()->heap.globalObjectCount());
+        data.statisticsNumbers.set(ASCIILiteral("_javascript_ProtectedObjectsCount"), JSDOMWindow::commonVM()->heap.protectedObjectCount());
+        data.statisticsNumbers.set(ASCIILiteral("_javascript_ProtectedGlobalObjectsCount"), JSDOMWindow::commonVM()->heap.protectedGlobalObjectCount());
         
         OwnPtr<TypeCountSet> protectedObjectTypeCounts(JSDOMWindow::commonVM()->heap.protectedObjectTypeCounts());
         fromCountedSetToHashMap(protectedObjectTypeCounts.get(), data._javascript_ProtectedObjectTypeCounts);
@@ -957,27 +957,27 @@
         fromCountedSetToHashMap(objectTypeCounts.get(), data._javascript_ObjectTypeCounts);
         
         uint64_t _javascript_HeapSize = JSDOMWindow::commonVM()->heap.size();
-        data.statisticsNumbers.set("_javascript_HeapSize", _javascript_HeapSize);
-        data.statisticsNumbers.set("_javascript_FreeSize", JSDOMWindow::commonVM()->heap.capacity() - _javascript_HeapSize);
+        data.statisticsNumbers.set(ASCIILiteral("_javascript_HeapSize"), _javascript_HeapSize);
+        data.statisticsNumbers.set(ASCIILiteral("_javascript_FreeSize"), JSDOMWindow::commonVM()->heap.capacity() - _javascript_HeapSize);
     }
 
     WTF::FastMallocStatistics fastMallocStatistics = WTF::fastMallocStatistics();
-    data.statisticsNumbers.set("FastMallocReservedVMBytes", fastMallocStatistics.reservedVMBytes);
-    data.statisticsNumbers.set("FastMallocCommittedVMBytes", fastMallocStatistics.committedVMBytes);
-    data.statisticsNumbers.set("FastMallocFreeListBytes", fastMallocStatistics.freeListBytes);
+    data.statisticsNumbers.set(ASCIILiteral("FastMallocReservedVMBytes"), fastMallocStatistics.reservedVMBytes);
+    data.statisticsNumbers.set(ASCIILiteral("FastMallocCommittedVMBytes"), fastMallocStatistics.committedVMBytes);
+    data.statisticsNumbers.set(ASCIILiteral("FastMallocFreeListBytes"), fastMallocStatistics.freeListBytes);
     
     // Gather icon statistics.
-    data.statisticsNumbers.set("IconPageURLMappingCount", iconDatabase().pageURLMappingCount());
-    data.statisticsNumbers.set("IconRetainedPageURLCount", iconDatabase().retainedPageURLCount());
-    data.statisticsNumbers.set("IconRecordCount", iconDatabase().iconRecordCount());
-    data.statisticsNumbers.set("IconsWithDataCount", iconDatabase().iconRecordCountWithData());
+    data.statisticsNumbers.set(ASCIILiteral("IconPageURLMappingCount"), iconDatabase().pageURLMappingCount());
+    data.statisticsNumbers.set(ASCIILiteral("IconRetainedPageURLCount"), iconDatabase().retainedPageURLCount());
+    data.statisticsNumbers.set(ASCIILiteral("IconRecordCount"), iconDatabase().iconRecordCount());
+    data.statisticsNumbers.set(ASCIILiteral("IconsWithDataCount"), iconDatabase().iconRecordCountWithData());
     
     // Gather font statistics.
-    data.statisticsNumbers.set("CachedFontDataCount", fontCache()->fontDataCount());
-    data.statisticsNumbers.set("CachedFontDataInactiveCount", fontCache()->inactiveFontDataCount());
+    data.statisticsNumbers.set(ASCIILiteral("CachedFontDataCount"), fontCache()->fontDataCount());
+    data.statisticsNumbers.set(ASCIILiteral("CachedFontDataInactiveCount"), fontCache()->inactiveFontDataCount());
     
     // Gather glyph page statistics.
-    data.statisticsNumbers.set("GlyphPageCount", GlyphPageTreeNode::treeGlyphPageCount());
+    data.statisticsNumbers.set(ASCIILiteral("GlyphPageCount"), GlyphPageTreeNode::treeGlyphPageCount());
     
     // Get WebCore memory cache statistics
     getWebCoreMemoryCacheStatistics(data.webCoreCacheStatistics);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to