Changeset 122087 in webkit


Ignore:
Timestamp:
Jul 8, 2012 9:59:12 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r121968.
​http://trac.webkit.org/changeset/121968
​https://bugs.webkit.org/show_bug.cgi?id=90749

Caused a link error on chromium Win dbg. (Requested by hayato
on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-07-08

  • inspector/InspectorMemoryAgent.cpp:

(WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):

  • inspector/front-end/NativeMemorySnapshotView.js:

(WebInspector.MemoryBlockViewProperties._initialize):

  • platform/MemoryUsageSupport.cpp:
  • platform/MemoryUsageSupport.h:

(MemoryUsageSupport):

  • platform/chromium/MemoryUsageSupportChromium.cpp:
Location:
trunk/Source/WebCore
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r122086 r122087  
     12012-07-08  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r121968.
     4        http://trac.webkit.org/changeset/121968
     5        https://bugs.webkit.org/show_bug.cgi?id=90749
     6
     7        Caused a link error on chromium Win dbg. (Requested by hayato
     8        on #webkit).
     9
     10        * inspector/InspectorMemoryAgent.cpp:
     11        (WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
     12        * inspector/front-end/NativeMemorySnapshotView.js:
     13        (WebInspector.MemoryBlockViewProperties._initialize):
     14        * platform/MemoryUsageSupport.cpp:
     15        * platform/MemoryUsageSupport.h:
     16        (MemoryUsageSupport):
     17        * platform/chromium/MemoryUsageSupportChromium.cpp:
     18
    1192012-07-08  Mary Wu  <mary.wu@torchmobile.com.cn>
    220

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

    r121968 r122087  
    545545}
    546546
    547 static void addPlatformComponentsInfo(PassRefPtr<TypeBuilder::Array<InspectorMemoryBlock> > children)
    548 {
    549     Vector<MemoryUsageSupport::ComponentInfo> components;
    550     MemoryUsageSupport::memoryUsageByComponents(components);
    551     for (Vector<MemoryUsageSupport::ComponentInfo>::iterator it = components.begin(); it != components.end(); ++it) {
    552         RefPtr<InspectorMemoryBlock> block = InspectorMemoryBlock::create().setName(it->m_name);
    553         block->setSize(it->m_sizeInBytes);
    554         children->addItem(block);
    555     }
    556 }
    557 
    558547static PassRefPtr<InspectorMemoryBlock> memoryCacheInfo()
    559548{
    … …  
    614603    children->addItem(domTreeInfo(m_page, visitedObjects)); // TODO: collect for all pages?
    615604    children->addItem(jsExternalResourcesInfo(visitedObjects));
    616     addPlatformComponentsInfo(children);
    617605    processMemory->setChildren(children);
    618606}

  • trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js

    r121968 r122087  
    225225    addBlock("hsl(210, 60%,  80%)", "InspectorData", "Inspector data");
    226226    addBlock("hsl( 30, 60%,  80%)", "MemoryCache", "Memory cache resources");
    227     addBlock("hsl( 40, 60%,  80%)", "GlyphCache", "Glyph cache resources");
    228227    addBlock("hsl( 60, 60%,  80%)", "RenderTreeAllocated", "Render tree");
    229228    addBlock("hsl( 60, 60%,  80%)", "RenderTreeUsed", "Render tree used");

  • trunk/Source/WebCore/platform/MemoryUsageSupport.cpp

    r121968 r122087  
    6464}
    6565
    66 void MemoryUsageSupport::memoryUsageByComponents(Vector<ComponentInfo>&)
    67 {
    68 }
    69 
    7066} // namespace WebCore

  • trunk/Source/WebCore/platform/MemoryUsageSupport.h

    r121968 r122087  
    3232#define MemoryUsageSupport_h
    3333
    34 #include <wtf/Vector.h>
    35 #include <wtf/text/WTFString.h>
    36 
    3734namespace WebCore {
    3835
    … …  
    6158    // false on platform specific error conditions.
    6259    static bool processMemorySizesInBytes(size_t* privateBytes, size_t* sharedBytes);
    63 
    64     class ComponentInfo {
    65     public:
    66         ComponentInfo(const String& name, size_t size) : m_name(name), m_sizeInBytes(size) { }
    67 
    68         const String m_name;
    69         size_t m_sizeInBytes;
    70     };
    71 
    72     // Reports private memory used by components in bytes.
    73     static void memoryUsageByComponents(Vector<ComponentInfo>&);
    7460};
    7561

  • trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp

    r121968 r122087  
    3333
    3434#include <public/Platform.h>
    35 #include <third_party/skia/src/core/SkGlyphCache.h>
    3635
    3736namespace WebCore {
    … …  
    6766}
    6867
    69 static bool glyphCacheVisitor(SkGlyphCache* cache, void* context)
    70 {
    71     size_t* sizePtr = reinterpret_cast<size_t*>(context);
    72     *sizePtr += sizeof(*cache);
    73     return false;
    74 }
    75 
    76 void MemoryUsageSupport::memoryUsageByComponents(Vector<ComponentInfo>& components)
    77 {
    78     size_t size = 0;
    79     SkGlyphCache::VisitAllCaches(glyphCacheVisitor, &size);
    80     components.append(ComponentInfo("GlyphCache", size));
    81 }
    82 
    8368} // namespace WebCore
Note: See TracChangeset for help on using the changeset viewer.