Changeset 149882 in webkit
- Timestamp:
- May 10, 2013 10:03:47 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r149796 r149882 1829 1829 platform/LinkHash.cpp 1830 1830 platform/Logging.cpp 1831 platform/MemoryUsageSupport.cpp1832 1831 platform/MIMETypeRegistry.cpp 1833 1832 platform/MemoryPressureHandler.cpp -
trunk/Source/WebCore/ChangeLog
r149881 r149882 1 2013-05-10 Anders Carlsson <andersca@apple.com> 2 3 Remove MemoryUsageSupport class 4 https://bugs.webkit.org/show_bug.cgi?id=115913 5 6 Reviewed by Andreas Kling. 7 8 MemoryUsageSupport was just used by a single call site in InspectorTimelineAgent, 9 and the function called always returns zero on all platforms! Remove it. 10 11 * CMakeLists.txt: 12 * GNUmakefile.list.am: 13 * Target.pri: 14 * WebCore.vcproj/WebCore.vcproj: 15 * WebCore.vcxproj/WebCore.vcxproj: 16 * WebCore.vcxproj/WebCore.vcxproj.filters: 17 * WebCore.xcodeproj/project.pbxproj: 18 * inspector/InspectorMemoryAgent.cpp: 19 * inspector/InspectorTimelineAgent.cpp: 20 (WebCore): 21 (WebCore::InspectorTimelineAgent::setNativeHeapStatistics): 22 * platform/MemoryUsageSupport.cpp: Removed. 23 * platform/MemoryUsageSupport.h: Removed. 24 * platform/qt/MemoryUsageSupportQt.cpp: Removed. 25 1 26 2013-05-10 Ryosuke Niwa <rniwa@webkit.org> 2 27 -
trunk/Source/WebCore/GNUmakefile.list.am
r149871 r149882 6145 6145 Source/WebCore/platform/MemoryPressureHandler.cpp \ 6146 6146 Source/WebCore/platform/MemoryPressureHandler.h \ 6147 Source/WebCore/platform/MemoryUsageSupport.cpp \6148 Source/WebCore/platform/MemoryUsageSupport.h \6149 6147 Source/WebCore/platform/NotImplemented.cpp \ 6150 6148 Source/WebCore/platform/NotImplemented.h \ -
trunk/Source/WebCore/Target.pri
r149708 r149882 1076 1076 platform/Logging.cpp \ 1077 1077 platform/MemoryPressureHandler.cpp \ 1078 platform/qt/MemoryUsageSupportQt.cpp \1079 1078 platform/MIMETypeRegistry.cpp \ 1080 1079 platform/mock/DeviceMotionClientMock.cpp \ … … 2315 2314 platform/Language.h \ 2316 2315 platform/MemoryPressureHandler.h \ 2317 platform/MemoryUsageSupport.h \2318 2316 platform/MainThreadTask.h \ 2319 2317 platform/MIMETypeRegistry.h \ -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r149871 r149882 29032 29032 </File> 29033 29033 <File 29034 RelativePath="..\platform\MemoryUsageSupport.cpp"29035 >29036 </File>29037 <File29038 RelativePath="..\platform\MemoryUsageSupport.h"29039 >29040 </File>29041 <File29042 29034 RelativePath="..\platform\MainThreadTask.h" 29043 29035 > -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r149871 r149882 4110 4110 <ClCompile Include="..\platform\Logging.cpp" /> 4111 4111 <ClCompile Include="..\platform\MemoryPressureHandler.cpp" /> 4112 <ClCompile Include="..\platform\MemoryUsageSupport.cpp" />4113 4112 <ClCompile Include="..\platform\MIMETypeRegistry.cpp" /> 4114 4113 <ClCompile Include="..\platform\NotImplemented.cpp" /> … … 11566 11565 <ClInclude Include="..\platform\Logging.h" /> 11567 11566 <ClInclude Include="..\platform\MemoryPressureHandler.h" /> 11568 <ClInclude Include="..\platform\MemoryUsageSupport.h" />11569 11567 <ClInclude Include="..\platform\MainThreadTask.h" /> 11570 11568 <ClInclude Include="..\platform\MIMETypeRegistry.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r149871 r149882 1162 1162 <Filter>platform</Filter> 1163 1163 </ClCompile> 1164 <ClCompile Include="..\platform\MemoryUsageSupport.cpp">1165 <Filter>platform</Filter>1166 </ClCompile>1167 1164 <ClCompile Include="..\platform\MIMETypeRegistry.cpp"> 1168 1165 <Filter>platform</Filter> … … 7958 7955 </ClInclude> 7959 7956 <ClInclude Include="..\platform\MemoryPressureHandler.h"> 7960 <Filter>platform</Filter>7961 </ClInclude>7962 <ClInclude Include="..\platform\MemoryUsageSupport.h">7963 7957 <Filter>platform</Filter> 7964 7958 </ClInclude> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r149871 r149882 5324 5324 D619A307144E00BE004BC302 /* ChildListMutationScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D619A305144E00BE004BC302 /* ChildListMutationScope.cpp */; }; 5325 5325 D619A308144E00BE004BC302 /* ChildListMutationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = D619A306144E00BE004BC302 /* ChildListMutationScope.h */; }; 5326 D630E2AC149BF344005B2F95 /* MemoryUsageSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */; };5327 5326 D630E2AC149BF344005B2F96 /* EventTracer.h in Headers */ = {isa = PBXBuildFile; fileRef = D630E2AB149BF344005B2F96 /* EventTracer.h */; }; 5328 5327 D6489D25166FFCF1007C031B /* JSHTMLTemplateElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6489D23166FFCF1007C031B /* JSHTMLTemplateElement.cpp */; }; … … 5336 5335 D6F7960D166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6F7960C166FFECE0076DD18 /* JSHTMLTemplateElementCustom.cpp */; }; 5337 5336 D6FDAEF3149C06190037B1E1 /* HistogramSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */; }; 5338 D6FDAEF3149C06190037B1E3 /* MemoryUsageSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */; };5339 5337 D6FDAEF3149C06190037B1E4 /* EventTracer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D6FDAEF2149C06190037B1E4 /* EventTracer.cpp */; }; 5340 5338 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>"; }; 12108 12106 D630E2AB149BF344005B2F93 /* HistogramSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistogramSupport.h; sourceTree = "<group>"; }; 12109 D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoryUsageSupport.h; sourceTree = "<group>"; };12110 12107 D630E2AB149BF344005B2F96 /* EventTracer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventTracer.h; sourceTree = "<group>"; }; 12111 12108 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>"; }; 12121 12118 D6FDAEF2149C06190037B1E1 /* HistogramSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HistogramSupport.cpp; sourceTree = "<group>"; }; 12122 D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryUsageSupport.cpp; sourceTree = "<group>"; };12123 12119 D6FDAEF2149C06190037B1E4 /* EventTracer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventTracer.cpp; sourceTree = "<group>"; }; 12124 12120 D70AD65513E1342B005B50B4 /* RenderRegion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderRegion.cpp; sourceTree = "<group>"; }; … … 19351 19347 657EDA061385CB97004E0645 /* MemoryPressureHandler.cpp */, 19352 19348 657EDA071385CB97004E0645 /* MemoryPressureHandler.h */, 19353 D6FDAEF2149C06190037B1E3 /* MemoryUsageSupport.cpp */,19354 D630E2AB149BF344005B2F95 /* MemoryUsageSupport.h */,19355 19349 BC772C4C0C4EB3040083285F /* MIMETypeRegistry.cpp */, 19356 19350 BC772C4D0C4EB3040083285F /* MIMETypeRegistry.h */, … … 22903 22897 9FFE3E7B11B59C5D0037874E /* MemoryInfo.h in Headers */, 22904 22898 6571DCC81385E6A400702DD0 /* MemoryPressureHandler.h in Headers */, 22905 D630E2AC149BF344005B2F95 /* MemoryUsageSupport.h in Headers */,22906 22899 93309DFA099E64920056E581 /* MergeIdenticalElementsCommand.h in Headers */, 22907 22900 E1ADECCE0E76AD8B004A1A5E /* MessageChannel.h in Headers */, … … 26088 26081 657EDA081385CB97004E0645 /* MemoryPressureHandler.cpp in Sources */, 26089 26082 657EDA0B1385CBD8004E0645 /* MemoryPressureHandlerMac.mm in Sources */, 26090 D6FDAEF3149C06190037B1E3 /* MemoryUsageSupport.cpp in Sources */,26091 26083 93309DF9099E64920056E581 /* MergeIdenticalElementsCommand.cpp in Sources */, 26092 26084 E1ADECCF0E76AD8B004A1A5E /* MessageChannel.cpp in Sources */, -
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
r148976 r149882 46 46 #include "InstrumentingAgents.h" 47 47 #include "MemoryCache.h" 48 #include "MemoryUsageSupport.h"49 48 #include "Node.h" 50 49 #include "NodeTraversal.h" -
trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp
r148921 r149882 48 48 #include "InstrumentingAgents.h" 49 49 #include "IntRect.h" 50 #include "MemoryUsageSupport.h"51 50 #include "RenderObject.h" 52 51 #include "RenderView.h" … … 598 597 } 599 598 599 // FIXME: This entire function can probably be removed, since it's a no-op. 600 600 void InspectorTimelineAgent::setNativeHeapStatistics(TypeBuilder::Timeline::TimelineEvent* record) 601 601 { … … 605 605 return; 606 606 RefPtr<InspectorObject> stats = InspectorObject::create(); 607 size_t privateBytes = 0; 608 size_t sharedBytes = 0; 609 MemoryUsageSupport::processMemorySizesInBytes(&privateBytes, &sharedBytes); 610 stats->setNumber("PrivateBytes", privateBytes); 607 stats->setNumber("PrivateBytes", 0); 611 608 record->setNativeHeapStatistics(stats.release()); 612 609 }
Note: See TracChangeset
for help on using the changeset viewer.