Changeset 139589 in webkit


Ignore:
Timestamp:
Jan 14, 2013 12:21:49 AM (11 years ago)
Author:
loislo@chromium.org
Message:

Web Inspector: Native Memory Instrumentation: fix instrumentation for already instrumented classes 2/N
​https://bugs.webkit.org/show_bug.cgi?id=106546

Reviewed by Vsevolod Vlasov.

Many nontrivial class members were added into reportMemoryUsage methods.

  • bindings/v8/V8PerIsolateData.cpp:

(WebCore::V8PerIsolateData::reportMemoryUsage):

  • css/CSSMediaRule.cpp:

(WebCore::CSSMediaRule::reportMemoryUsage):

  • css/CSSProperty.cpp:

(WebCore::CSSProperty::reportMemoryUsage):

  • css/CSSStyleSheet.cpp:

(WebCore::CSSStyleSheet::reportMemoryUsage):

  • css/MediaList.cpp:

(WebCore::MediaList::reportMemoryUsage):

  • css/RuleSet.cpp:

(WebCore::RuleData::reportMemoryUsage):
(WebCore::RuleSet::reportMemoryUsage):
(WebCore::RuleSet::RuleSetSelectorPair::reportMemoryUsage):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::MatchedPropertiesCacheItem::reportMemoryUsage):
(WebCore::StyleResolver::reportMemoryUsage):

  • css/StyleSheetContents.cpp:

(WebCore::StyleSheetContents::reportMemoryUsage):

  • dom/TreeScope.cpp:

(WebCore::TreeScope::reportMemoryUsage):

  • inspector/HeapGraphSerializer.cpp:

(WebCore::HeapGraphSerializer::reportMemoryUsage):

  • inspector/InspectorMemoryAgent.cpp:
  • inspector/InspectorProfilerAgent.cpp:

(WebCore::InspectorProfilerAgent::reportMemoryUsage):

  • inspector/MemoryInstrumentationImpl.cpp:

(WebCore::MemoryInstrumentationClientImpl::reportMemoryUsage):

  • loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::reportMemoryUsage):

  • loader/FrameLoader.cpp:

(WebCore::FrameLoader::reportMemoryUsage):

  • loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::reportMemoryUsage):

  • loader/Prerenderer.cpp:

(WebCore::Prerenderer::reportMemoryUsage):

  • loader/ResourceLoader.cpp:

(WebCore::ResourceLoader::reportMemoryUsage):

  • loader/cache/CachedImage.cpp:

(WebCore::CachedImage::reportMemoryUsage):

  • page/Page.cpp:

(WebCore::Page::reportMemoryUsage):

Location:
trunk/Source/WebCore
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r139573 r139589  
     12013-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 added into 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
    1532013-01-13  Levi Weintraub  <leviw@chromium.org>
    254

  • trunk/Source/WebCore/bindings/v8/V8PerIsolateData.cpp

    r139310 r139589  
    107107    info.addMember(m_templates);
    108108    info.addMember(m_stringCache);
     109    info.addMember(m_integerCache);
    109110    info.addMember(m_domDataList);
     111    info.addMember(m_domDataStore);
     112    info.addMember(m_hiddenPropertyName);
     113    info.addMember(m_gcEventData);
    110114
    111115    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);
    112122}
    113123

  • trunk/Source/WebCore/css/CSSProperty.cpp

    r139310 r139589  
    702702    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
    703703    info.addMember(m_value);
     704    info.ignoreMember(m_metadata);
    704705}
    705706

  • trunk/Source/WebCore/css/CSSStyleSheet.cpp

    r139310 r139589  
    190190    info.addMember(m_mediaCSSOMWrapper);
    191191    info.addMember(m_childRuleCSSOMWrappers);
     192    info.addMember(m_ruleListCSSOMWrapper);
    192193}
    193194

  • trunk/Source/WebCore/css/MediaList.cpp

    r139310 r139589  
    301301    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
    302302    info.addMember(m_mediaQueries);
     303    info.addMember(m_parentStyleSheet);
     304    info.addMember(m_parentRule);
    303305}
    304306

  • trunk/Source/WebCore/css/RuleSet.cpp

    r139310 r139589  
    130130{
    131131    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     132    info.addMember(m_rule);
    132133}
    133134
    … …  
    154155    info.addMember(m_pageRules);
    155156    info.addMember(m_regionSelectorsAndRuleSets);
     157    info.addMember(m_features);
    156158}
    157159
    … …  
    160162    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
    161163    info.addMember(ruleSet);
     164    info.addMember(selector);
    162165}
    163166

  • trunk/Source/WebCore/css/StyleResolver.cpp

    r139406 r139589  
    53065306    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
    53075307    info.addMember(matchedProperties);
     5308    info.addMember(ranges);
     5309    info.addMember(renderStyle);
     5310    info.addMember(parentRenderStyle);
    53085311}
    53095312
    … …  
    53205323    info.addMember(m_authorStyle);
    53215324    info.addMember(m_userStyle);
     5325    info.addMember(m_features);
    53225326    info.addMember(m_siblingRuleSet);
    53235327    info.addMember(m_uncommonAttributeRuleSet);
    53245328    info.addMember(m_keyframesRuleMap);
    53255329    info.addMember(m_matchedPropertiesCache);
     5330    info.addMember(m_matchedPropertiesCacheSweepTimer);
    53265331    info.addMember(m_matchedRules);
    53275332
    53285333    info.addMember(m_ruleList);
    53295334    info.addMember(m_pendingImageProperties);
     5335    info.addMember(m_medium);
     5336    info.addMember(m_rootDefaultStyle);
     5337    info.addMember(m_document);
     5338
     5339    // FIXME: pointer to RenderStyle could point to an already deleted object.
     5340    info.ignoreMember(m_parentStyle);
     5341    info.ignoreMember(m_rootElementStyle);
     5342
     5343    info.addMember(m_element);
     5344    info.addMember(m_styledElement);
     5345    info.addMember(m_regionForStyling);
     5346    info.addMember(m_parentNode);
    53305347    info.addMember(m_lineHeightValue);
     5348    info.addMember(m_fontSelector);
    53315349    info.addMember(m_viewportDependentMediaQueryResults);
     5350    info.ignoreMember(m_styleBuilder);
    53325351    info.addMember(m_styleRuleToCSSOMWrapperMap);
    53335352    info.addMember(m_styleSheetCSSOMWrapperSet);

  • trunk/Source/WebCore/css/StyleSheetContents.cpp

    r139310 r139589  
    513513{
    514514    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     515    info.addMember(m_ownerRule);
    515516    info.addMember(m_originalURL);
    516517    info.addMember(m_encodingFromCharsetRule);
    … …  
    518519    info.addMember(m_childRules);
    519520    info.addMember(m_namespaces);
     521    info.addMember(m_parserContext);
    520522    info.addMember(m_clients);
    521523}

  • trunk/Source/WebCore/dom/TreeScope.cpp

    r139325 r139589  
    379379    info.addMember(m_idTargetObserverRegistry);
    380380    info.addMember(m_selection);
     381    info.addMember(m_documentScope);
     382
    381383}
    382384

  • trunk/Source/WebCore/inspector/HeapGraphSerializer.cpp

    r139310 r139589  
    198198    info.addMember(m_nodes);
    199199    info.addMember(m_edges);
     200    info.addMember(m_roots);
    200201}
    201202

  • trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

    r139310 r139589  
    389389        ScriptProfiler::visitExternalStrings(const_cast<ExternalStringsRoot*>(this));
    390390        m_memoryClassInfo = 0;
     391        info.ignoreMember(m_memoryClassInfo);
    391392    }
    392393
    … …  
    410411        ScriptProfiler::visitExternalArrays(const_cast<ExternalArraysRoot*>(this));
    411412        m_memoryClassInfo = 0;
     413        info.ignoreMember(m_memoryClassInfo);
    412414    }
    413415

  • trunk/Source/WebCore/inspector/InspectorProfilerAgent.cpp

    r139310 r139589  
    500500    info.addMember(m_profiles);
    501501    info.addMember(m_snapshots);
     502    info.addMember(m_profileNameIdleTimeMap);
    502503}
    503504

  • trunk/Source/WebCore/inspector/MemoryInstrumentationImpl.cpp

    r139310 r139589  
    127127    info.addMember(m_allocatedObjects);
    128128    info.addMember(m_countedObjects);
     129    info.addMember(m_graphSerializer);
    129130}
    130131

  • trunk/Source/WebCore/loader/DocumentLoader.cpp

    r139310 r139589  
    361361    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
    362362    info.addMember(m_frame);
     363    info.addMember(m_cachedResourceLoader);
    363364    info.addMember(m_mainResourceLoader);
     365    info.addMember(m_mainResourceData);
    364366    info.addMember(m_subresourceLoaders);
    365367    info.addMember(m_multipartSubresourceLoaders);
    … …  
    376378    info.addMember(m_responses);
    377379    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
    378386    info.addMember(m_resourcesClientKnowsAbout);
    379387    info.addMember(m_resourcesLoadedFromMemoryCacheForClientNotification);
    380388    info.addMember(m_clientRedirectSourceForHistory);
    381     info.addMember(m_mainResourceData);
     389    info.addMember(m_iconLoadDecisionCallback);
     390    info.addMember(m_iconDataCallback);
     391    info.addMember(m_applicationCacheHost);
    382392}
    383393

  • trunk/Source/WebCore/loader/FrameLoader.cpp

    r139310 r139589  
    32923292{
    32933293    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
     3294    info.addMember(m_frame);
     3295    info.ignoreMember(m_client);
     3296    info.addMember(m_progressTracker);
    32943297    info.addMember(m_documentLoader);
    32953298    info.addMember(m_provisionalDocumentLoader);
    32963299    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);
    32973305    info.addMember(m_outgoingReferrer);
    3298     info.addMember(m_openedFrames);
     3306    info.addMember(m_networkingContext);
     3307    info.addMember(m_previousUrl);
     3308    info.addMember(m_requestedHistoryItem);
    32993309}
    33003310

  • trunk/Source/WebCore/loader/MainResourceLoader.cpp

    r139350 r139589  
    603603{
    604604    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
     605    info.addMember(m_resource);
    605606    info.addMember(m_initialRequest);
    606607    info.addMember(m_substituteData);
    607608    info.addMember(m_dataLoadTimer);
     609    info.addMember(m_documentLoader);
    608610}
    609611

  • trunk/Source/WebCore/loader/Prerenderer.cpp

    r139310 r139589  
    149149    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
    150150    ActiveDOMObject::reportMemoryUsage(memoryObjectInfo);
     151    info.ignoreMember(m_client);
    151152    info.addMember(m_activeHandles);
    152153    info.addMember(m_suspendedHandles);

  • trunk/Source/WebCore/loader/ResourceLoader.cpp

    r139310 r139589  
    540540{
    541541    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader);
    542     info.addMember(m_handle.get());
     542    info.addMember(m_handle);
    543543    info.addMember(m_frame);
    544544    info.addMember(m_documentLoader);

  • trunk/Source/WebCore/loader/cache/CachedImage.cpp

    r139484 r139589  
    4040#include "SubresourceLoader.h"
    4141#include <wtf/CurrentTime.h>
     42#include <wtf/MemoryInstrumentationHashMap.h>
    4243#include <wtf/MemoryObjectInfo.h>
    4344#include <wtf/StdLibExtras.h>
    … …  
    490491    memoryObjectInfo->setClassName("CachedImage");
    491492    CachedResource::reportMemoryUsage(memoryObjectInfo);
     493    info.addMember(m_pendingContainerSizeRequests);
    492494    info.addMember(m_image, "m_image");
    493495#if ENABLE(SVG)

  • trunk/Source/WebCore/page/Page.cpp

    r139310 r139589  
    13741374    info.ignoreMember(m_alternativeTextClient);
    13751375    info.ignoreMember(m_editorClient);
     1376    info.ignoreMember(m_plugInClient);
    13761377    info.ignoreMember(m_validationMessageClient);
    13771378}
Note: See TracChangeset for help on using the changeset viewer.