Changeset 149882 in webkit

Timestamp:

May 10, 2013 10:03:47 AM (11 years ago)

Author:

andersca@apple.com

Message:

Remove MemoryUsageSupport class
​https://bugs.webkit.org/show_bug.cgi?id=115913

Reviewed by Andreas Kling.

MemoryUsageSupport was just used by a single call site in InspectorTimelineAgent,
and the function called always returns zero on all platforms! Remove it.

• CMakeLists.txt:
• GNUmakefile.list.am:
• Target.pri:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.vcxproj/WebCore.vcxproj:
• WebCore.vcxproj/WebCore.vcxproj.filters:
• WebCore.xcodeproj/project.pbxproj:
• inspector/InspectorMemoryAgent.cpp:
• inspector/InspectorTimelineAgent.cpp:

(WebCore):
(WebCore::InspectorTimelineAgent::setNativeHeapStatistics):

• platform/MemoryUsageSupport.cpp: Removed.
• platform/MemoryUsageSupport.h: Removed.
• platform/qt/MemoryUsageSupportQt.cpp: Removed.

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• Target.pri (modified) (2 diffs)
• WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore.vcxproj/WebCore.vcxproj (modified) (2 diffs)
• WebCore.vcxproj/WebCore.vcxproj.filters (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (7 diffs)
• inspector/InspectorMemoryAgent.cpp (modified) (1 diff)
• inspector/InspectorTimelineAgent.cpp (modified) (3 diffs)
• platform/MemoryUsageSupport.cpp (deleted)
• platform/MemoryUsageSupport.h (deleted)
• platform/qt/MemoryUsageSupportQt.cpp (deleted)

trunk/Source/WebCore/CMakeLists.txt

@@ -1829 +1829 @@
     platform/LinkHash.cpp
     platform/Logging.cpp
-    platform/MemoryUsageSupport.cpp
     platform/MIMETypeRegistry.cpp
     platform/MemoryPressureHandler.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-10  Anders Carlsson  <andersca@apple.com>
+
+        Remove MemoryUsageSupport class
+        https://bugs.webkit.org/show_bug.cgi?id=115913
+
+        Reviewed by Andreas Kling.
+
+        MemoryUsageSupport was just used by a single call site in InspectorTimelineAgent,
+        and the function called always returns zero on all platforms! Remove it.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Target.pri:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * inspector/InspectorMemoryAgent.cpp:
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore):
+        (WebCore::InspectorTimelineAgent::setNativeHeapStatistics):
+        * platform/MemoryUsageSupport.cpp: Removed.
+        * platform/MemoryUsageSupport.h: Removed.
+        * platform/qt/MemoryUsageSupportQt.cpp: Removed.
+
 2013-05-10  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -6145 +6145 @@
         Source/WebCore/platform/MemoryPressureHandler.cpp \
         Source/WebCore/platform/MemoryPressureHandler.h \
-        Source/WebCore/platform/MemoryUsageSupport.cpp \
-        Source/WebCore/platform/MemoryUsageSupport.h \
         Source/WebCore/platform/NotImplemented.cpp \
         Source/WebCore/platform/NotImplemented.h \

trunk/Source/WebCore/Target.pri

@@ -1076 +1076 @@
     platform/Logging.cpp \
     platform/MemoryPressureHandler.cpp \
-    platform/qt/MemoryUsageSupportQt.cpp \
     platform/MIMETypeRegistry.cpp \
     platform/mock/DeviceMotionClientMock.cpp \
@@ -2315 +2314 @@
     platform/Language.h \
     platform/MemoryPressureHandler.h \
-    platform/MemoryUsageSupport.h \
     platform/MainThreadTask.h \
     platform/MIMETypeRegistry.h \

trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -29032 +29032 @@
                         </File>
                         <File
-                                RelativePath="..\platform\MemoryUsageSupport.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\platform\MemoryUsageSupport.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\platform\MainThreadTask.h"
                                 >

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -4110 +4110 @@
     <ClCompile Include="..\platform\Logging.cpp" />
     <ClCompile Include="..\platform\MemoryPressureHandler.cpp" />
-    <ClCompile Include="..\platform\MemoryUsageSupport.cpp" />
     <ClCompile Include="..\platform\MIMETypeRegistry.cpp" />
     <ClCompile Include="..\platform\NotImplemented.cpp" />
@@ -11566 +11565 @@
     <ClInclude Include="..\platform\Logging.h" />
     <ClInclude Include="..\platform\MemoryPressureHandler.h" />
-    <ClInclude Include="..\platform\MemoryUsageSupport.h" />
     <ClInclude Include="..\platform\MainThreadTask.h" />
     <ClInclude Include="..\platform\MIMETypeRegistry.h" />

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

@@ -1162 +1162 @@
       <Filter>platform</Filter>
     </ClCompile>
-    <ClCompile Include="..\platform\MemoryUsageSupport.cpp">
-      <Filter>platform</Filter>
-    </ClCompile>
     <ClCompile Include="..\platform\MIMETypeRegistry.cpp">
       <Filter>platform</Filter>
@@ -7958 +7955 @@
     </ClInclude>
     <ClInclude Include="..\platform\MemoryPressureHandler.h">
-      <Filter>platform</Filter>
-    </ClInclude>
-    <ClInclude Include="..\platform\MemoryUsageSupport.h">
       <Filter>platform</Filter>
     </ClInclude>

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -5324 +5324 @@
                 D619A307144E00BE004BC302 /* ChildListMutationScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D619A305144E00BE004BC302 /* ChildListMutationScope.cpp */; };
                 D619A308144E00BE004BC302 /* ChildListMutationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = D619A306144E00BE004BC302 /* ChildListMutationScope.h */; };
-                D630E2AC149BF344005B2F95 /* MemoryUsageSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */; };
                 D630E2AC149BF344005B2F96 /* EventTracer.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F96 /* EventTracer.h */; };
                 D6489D25166FFCF1007C031B /* JSHTMLTemplateElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6489D23166FFCF1007C031B /* JSHTMLTemplateElement.cpp */; };
@@ -5336 +5335 @@
                 D6F7960D166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6F7960C166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp */; };
                 D6FDAEF3149C06190037B1E1 /* HistogramSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */; };
-                D6FDAEF3149C06190037B1E3 /* MemoryUsageSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */; };
                 D6FDAEF3149C06190037B1E4 /* EventTracer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E4 /* EventTracer.cpp */; };
                 D70AD65713E1342B005B50B4 /* RenderRegion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D70AD65513E1342B005B50B4 /* RenderRegion.cpp */; };
@@ -12107 +12105 @@
                 D619A306144E00BE004BC302 /* ChildListMutationScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChildListMutationScope.h; sourceTree = "<group>"; };
                 D630E2AB149BF344005B2F93 /* HistogramSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistogramSupport.h; sourceTree = "<group>"; };
-                D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryUsageSupport.h; sourceTree = "<group>"; };
                 D630E2AB149BF344005B2F96 /* EventTracer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTracer.h; sourceTree = "<group>"; };
                 D6489D23166FFCF1007C031B /* JSHTMLTemplateElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTemplateElement.cpp; sourceTree = "<group>"; };
@@ -12120 +12117 @@
                 D6F7960C166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLTemplateElementCustom.cpp; sourceTree = "<group>"; };
                 D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistogramSupport.cpp; sourceTree = "<group>"; };
-                D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryUsageSupport.cpp; sourceTree = "<group>"; };
                 D6FDAEF2149C06190037B1E4 /* EventTracer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventTracer.cpp; sourceTree = "<group>"; };
                 D70AD65513E1342B005B50B4 /* RenderRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderRegion.cpp; sourceTree = "<group>"; };
@@ -19351 +19347 @@
                                 657EDA061385CB97004E0645 /* MemoryPressureHandler.cpp */,
                                 657EDA071385CB97004E0645 /* MemoryPressureHandler.h */,
-                                D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */,
-                                D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */,
                                 BC772C4C0C4EB3040083285F /* MIMETypeRegistry.cpp */,
                                 BC772C4D0C4EB3040083285F /* MIMETypeRegistry.h */,
@@ -22903 +22897 @@
                                 9FFE3E7B11B59C5D0037874E /* MemoryInfo.h in Headers */,
                                 6571DCC81385E6A400702DD0 /* MemoryPressureHandler.h in Headers */,
-                                D630E2AC149BF344005B2F95 /* MemoryUsageSupport.h in Headers */,
                                 93309DFA099E64920056E581 /* MergeIdenticalElementsCommand.h in Headers */,
                                 E1ADECCE0E76AD8B004A1A5E /* MessageChannel.h in Headers */,
@@ -26088 +26081 @@
                                 657EDA081385CB97004E0645 /* MemoryPressureHandler.cpp in Sources */,
                                 657EDA0B1385CBD8004E0645 /* MemoryPressureHandlerMac.mm in Sources */,
-                                D6FDAEF3149C06190037B1E3 /* MemoryUsageSupport.cpp in Sources */,
                                 93309DF9099E64920056E581 /* MergeIdenticalElementsCommand.cpp in Sources */,
                                 E1ADECCF0E76AD8B004A1A5E /* MessageChannel.cpp in Sources */,

trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

@@ -46 +46 @@
 #include "InstrumentingAgents.h"
 #include "MemoryCache.h"
-#include "MemoryUsageSupport.h"
 #include "Node.h"
 #include "NodeTraversal.h"

trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp

@@ -48 +48 @@
 #include "InstrumentingAgents.h"
 #include "IntRect.h"
-#include "MemoryUsageSupport.h"
 #include "RenderObject.h"
 #include "RenderView.h"
@@ -598 +597 @@
 }
 
+// FIXME: This entire function can probably be removed, since it's a no-op.
 void InspectorTimelineAgent::setNativeHeapStatistics(TypeBuilder::Timeline::TimelineEvent* record)
 {
@@ -605 +605 @@
         return;
     RefPtr<InspectorObject> stats = InspectorObject::create();
-    size_t privateBytes = 0;
-    size_t sharedBytes = 0;
-    MemoryUsageSupport::processMemorySizesInBytes(&privateBytes, &sharedBytes);
-    stats->setNumber("PrivateBytes", privateBytes);
+    stats->setNumber("PrivateBytes", 0);
     record->setNativeHeapStatistics(stats.release());
 }