Changeset 139306 in webkit
- Timestamp:
- Jan 10, 2013 3:31:09 AM (11 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r139291 r139306 1 2013-01-10 Ilya Tikhonovsky <loislo@chromium.org> 2 3 Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 2/N 4 https://bugs.webkit.org/show_bug.cgi?id=106546 5 6 Reviewed by Vsevolod Vlasov. 7 8 Many nontrivial class members were instrumented in reportMemoryUsage methods. 9 10 * bindings/v8/V8PerIsolateData.cpp: 11 (WebCore::V8PerIsolateData::reportMemoryUsage): 12 * css/CSSMediaRule.cpp: 13 (WebCore::CSSMediaRule::reportMemoryUsage): 14 * css/CSSProperty.cpp: 15 (WebCore::CSSProperty::reportMemoryUsage): 16 * css/CSSStyleSheet.cpp: 17 (WebCore::CSSStyleSheet::reportMemoryUsage): 18 * css/MediaList.cpp: 19 (WebCore::MediaList::reportMemoryUsage): 20 * css/RuleSet.cpp: 21 (WebCore::RuleData::reportMemoryUsage): 22 (WebCore::RuleSet::reportMemoryUsage): 23 (WebCore::RuleSet::RuleSetSelectorPair::reportMemoryUsage): 24 * css/StyleResolver.cpp: 25 (WebCore::StyleResolver::MatchedPropertiesCacheItem::reportMemoryUsage): 26 (WebCore::StyleResolver::reportMemoryUsage): 27 * css/StyleSheetContents.cpp: 28 (WebCore::StyleSheetContents::reportMemoryUsage): 29 * dom/TreeScope.cpp: 30 (WebCore::TreeScope::reportMemoryUsage): 31 * inspector/HeapGraphSerializer.cpp: 32 (WebCore::HeapGraphSerializer::reportMemoryUsage): 33 * inspector/InspectorMemoryAgent.cpp: 34 * inspector/InspectorProfilerAgent.cpp: 35 (WebCore::InspectorProfilerAgent::reportMemoryUsage): 36 * inspector/MemoryInstrumentationImpl.cpp: 37 (WebCore::MemoryInstrumentationClientImpl::reportMemoryUsage): 38 * loader/DocumentLoader.cpp: 39 (WebCore::DocumentLoader::reportMemoryUsage): 40 * loader/FrameLoader.cpp: 41 (WebCore::FrameLoader::reportMemoryUsage): 42 * loader/MainResourceLoader.cpp: 43 (WebCore::MainResourceLoader::reportMemoryUsage): 44 * loader/Prerenderer.cpp: 45 (WebCore::Prerenderer::reportMemoryUsage): 46 * loader/ResourceLoader.cpp: 47 (WebCore::ResourceLoader::reportMemoryUsage): 48 * loader/cache/CachedImage.cpp: 49 (WebCore::CachedImage::reportMemoryUsage): 50 * page/Page.cpp: 51 (WebCore::Page::reportMemoryUsage): 52 1 53 2013-01-10 Christophe Dumez <christophe.dumez@intel.com> 2 54 -
trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp
r136815 r139306 107 107 info.addMember(m_templates); 108 108 info.addMember(m_stringCache); 109 info.addMember(m_integerCache); 109 110 info.addMember(m_domDataList); 111 info.addMember(m_domDataStore); 112 info.addMember(m_hiddenPropertyName); 113 info.addMember(m_gcEventData); 110 114 111 115 info.addPrivateBuffer(ScriptProfiler::profilerSnapshotsSize(), WebCoreMemoryTypes::InspectorProfilerAgent); 116 117 info.ignoreMember(m_toStringTemplate); 118 info.ignoreMember(m_lazyEventListenerToStringTemplate); 119 info.ignoreMember(m_v8Null); 120 info.ignoreMember(m_liveRoot); 121 info.ignoreMember(m_auxiliaryContext); 112 122 } 113 123 -
trunk/Source/WebCore/css/CSSMediaRule.cpp
r135465 r139306 182 182 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 183 183 CSSRule::reportMemoryUsage(memoryObjectInfo); 184 info.addMember(m_mediaRule); 184 185 info.addMember(m_mediaCSSOMWrapper); 185 186 info.addMember(m_childRuleCSSOMWrappers); -
trunk/Source/WebCore/css/CSSProperty.cpp
r137359 r139306 702 702 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 703 703 info.addMember(m_value); 704 info.ignoreMember(m_metadata); 704 705 } 705 706 -
trunk/Source/WebCore/css/CSSStyleSheet.cpp
r135465 r139306 190 190 info.addMember(m_mediaCSSOMWrapper); 191 191 info.addMember(m_childRuleCSSOMWrappers); 192 info.addMember(m_ruleListCSSOMWrapper); 192 193 } 193 194 -
trunk/Source/WebCore/css/MediaList.cpp
r137318 r139306 301 301 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 302 302 info.addMember(m_mediaQueries); 303 info.addMember(m_parentStyleSheet); 304 info.addMember(m_parentRule); 303 305 } 304 306 -
trunk/Source/WebCore/css/RuleSet.cpp
r138854 r139306 130 130 { 131 131 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 132 info.addMember(m_rule); 132 133 } 133 134 … … 154 155 info.addMember(m_pageRules); 155 156 info.addMember(m_regionSelectorsAndRuleSets); 157 info.addMember(m_features); 156 158 } 157 159 … … 160 162 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 161 163 info.addMember(ruleSet); 164 info.addMember(selector); 162 165 } 163 166 -
trunk/Source/WebCore/css/StyleResolver.cpp
r138908 r139306 5306 5306 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 5307 5307 info.addMember(matchedProperties); 5308 info.addMember(ranges); 5309 info.addMember(renderStyle); 5310 info.addMember(parentRenderStyle); 5308 5311 } 5309 5312 … … 5320 5323 info.addMember(m_authorStyle); 5321 5324 info.addMember(m_userStyle); 5325 info.addMember(m_features); 5322 5326 info.addMember(m_siblingRuleSet); 5323 5327 info.addMember(m_uncommonAttributeRuleSet); 5324 5328 info.addMember(m_keyframesRuleMap); 5325 5329 info.addMember(m_matchedPropertiesCache); 5330 info.addMember(m_matchedPropertiesCacheSweepTimer); 5326 5331 info.addMember(m_matchedRules); 5327 5332 5328 5333 info.addMember(m_ruleList); 5329 5334 info.addMember(m_pendingImageProperties); 5335 info.addMember(m_medium); 5336 info.addMember(m_rootDefaultStyle); 5337 info.addMember(m_document); 5338 info.addMember(m_parentStyle); 5339 info.addMember(m_rootElementStyle); 5340 info.addMember(m_element); 5341 info.addMember(m_styledElement); 5342 info.addMember(m_regionForStyling); 5343 info.addMember(m_parentNode); 5330 5344 info.addMember(m_lineHeightValue); 5345 info.addMember(m_fontSelector); 5331 5346 info.addMember(m_viewportDependentMediaQueryResults); 5347 info.ignoreMember(m_styleBuilder); 5332 5348 info.addMember(m_styleRuleToCSSOMWrapperMap); 5333 5349 info.addMember(m_styleSheetCSSOMWrapperSet); -
trunk/Source/WebCore/css/StyleSheetContents.cpp
r137417 r139306 513 513 { 514 514 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 515 info.addMember(m_ownerRule); 515 516 info.addMember(m_originalURL); 516 517 info.addMember(m_encodingFromCharsetRule); … … 518 519 info.addMember(m_childRules); 519 520 info.addMember(m_namespaces); 521 info.addMember(m_parserContext); 520 522 info.addMember(m_clients); 521 523 } -
trunk/Source/WebCore/dom/TreeScope.cpp
r138735 r139306 379 379 info.addMember(m_idTargetObserverRegistry); 380 380 info.addMember(m_selection); 381 info.addMember(m_documentScope); 382 381 383 } 382 384 -
trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp
r138475 r139306 198 198 info.addMember(m_nodes); 199 199 info.addMember(m_edges); 200 info.addMember(m_roots); 200 201 } 201 202 -
trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp
r138457 r139306 389 389 ScriptProfiler::visitExternalStrings(const_cast<ExternalStringsRoot*>(this)); 390 390 m_memoryClassInfo = 0; 391 info.ignoreMember(m_memoryClassInfo); 391 392 } 392 393 … … 410 411 ScriptProfiler::visitExternalArrays(const_cast<ExternalArraysRoot*>(this)); 411 412 m_memoryClassInfo = 0; 413 info.ignoreMember(m_memoryClassInfo); 412 414 } 413 415 -
trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp
r138457 r139306 500 500 info.addMember(m_profiles); 501 501 info.addMember(m_snapshots); 502 info.addMember(m_profileNameIdleTimeMap); 502 503 } 503 504 -
trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp
r138452 r139306 127 127 info.addMember(m_allocatedObjects); 128 128 info.addMember(m_countedObjects); 129 info.addMember(m_graphSerializer); 129 130 } 130 131 -
trunk/Source/WebCore/loader/DocumentLoader.cpp
r138962 r139306 361 361 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader); 362 362 info.addMember(m_frame); 363 info.addMember(m_cachedResourceLoader); 363 364 info.addMember(m_mainResourceLoader); 365 info.addMember(m_mainResourceData); 364 366 info.addMember(m_subresourceLoaders); 365 367 info.addMember(m_multipartSubresourceLoaders); … … 376 378 info.addMember(m_responses); 377 379 info.addMember(m_pendingSubstituteResources); 380 info.addMember(m_substituteResourceDeliveryTimer); 381 info.addMember(m_archiveResourceCollection); 382 #if ENABLE(WEB_ARCHIVE) || ENABLE(MHTML) 383 info.addMember(m_archive); 384 info.addMember(m_parsedArchiveData); 385 #endif 378 386 info.addMember(m_resourcesClientKnowsAbout); 379 387 info.addMember(m_resourcesLoadedFromMemoryCacheForClientNotification); 380 388 info.addMember(m_clientRedirectSourceForHistory); 381 info.addMember(m_mainResourceData); 389 info.addMember(m_iconLoadDecisionCallback); 390 info.addMember(m_iconDataCallback); 391 info.addMember(m_applicationCacheHost); 382 392 } 383 393 -
trunk/Source/WebCore/loader/FrameLoader.cpp
r138962 r139306 3292 3292 { 3293 3293 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader); 3294 info.addMember(m_frame); 3295 info.ignoreMember(m_client); 3296 info.addMember(m_progressTracker); 3294 3297 info.addMember(m_documentLoader); 3295 3298 info.addMember(m_provisionalDocumentLoader); 3296 3299 info.addMember(m_policyDocumentLoader); 3300 info.addMember(m_pendingStateObject); 3301 info.addMember(m_submittedFormURL); 3302 info.addMember(m_checkTimer); 3303 info.addMember(m_opener); 3304 info.addMember(m_openedFrames); 3297 3305 info.addMember(m_outgoingReferrer); 3298 info.addMember(m_openedFrames); 3306 info.addMember(m_networkingContext); 3307 info.addMember(m_previousUrl); 3308 info.addMember(m_requestedHistoryItem); 3299 3309 } 3300 3310 -
trunk/Source/WebCore/loader/MainResourceLoader.cpp
r139150 r139306 598 598 { 599 599 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader); 600 info.addMember(m_resource); 600 601 info.addMember(m_initialRequest); 601 602 info.addMember(m_substituteData); 602 603 info.addMember(m_dataLoadTimer); 604 info.addMember(m_documentLoader); 603 605 } 604 606 -
trunk/Source/WebCore/loader/Prerenderer.cpp
r137045 r139306 149 149 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM); 150 150 ActiveDOMObject::reportMemoryUsage(memoryObjectInfo); 151 info.ignoreMember(m_client); 151 152 info.addMember(m_activeHandles); 152 153 info.addMember(m_suspendedHandles); -
trunk/Source/WebCore/loader/ResourceLoader.cpp
r138413 r139306 540 540 { 541 541 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader); 542 info.addMember(m_handle .get());542 info.addMember(m_handle); 543 543 info.addMember(m_frame); 544 544 info.addMember(m_documentLoader); -
trunk/Source/WebCore/loader/cache/CachedImage.cpp
r138976 r139306 40 40 #include "SubresourceLoader.h" 41 41 #include <wtf/CurrentTime.h> 42 #include <wtf/MemoryInstrumentationHashMap.h> 42 43 #include <wtf/MemoryObjectInfo.h> 43 44 #include <wtf/StdLibExtras.h> … … 488 489 memoryObjectInfo->setClassName("CachedImage"); 489 490 CachedResource::reportMemoryUsage(memoryObjectInfo); 491 info.addMember(m_pendingContainerSizeRequests); 490 492 info.addMember(m_image, "m_image"); 491 493 #if ENABLE(SVG) -
trunk/Source/WebCore/page/Page.cpp
r139192 r139306 1374 1374 info.ignoreMember(m_alternativeTextClient); 1375 1375 info.ignoreMember(m_editorClient); 1376 info.ignoreMember(m_plugInClient); 1376 1377 info.ignoreMember(m_validationMessageClient); 1377 1378 }
Note: See TracChangeset
for help on using the changeset viewer.