Changeset 140951 in webkit


Ignore:
Timestamp:
Jan 28, 2013 12:53:48 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Add an API for retrieving native memory information without going through the remote inspecting protocol
​https://bugs.webkit.org/show_bug.cgi?id=107651

Patch by Marja Hölttä <​marja@chromium.org> on 2013-01-28
Reviewed by Adam Barth.

  • WebKit.gyp:
  • public/WebDevToolsAgent.h:

(WebKit):
(WebDevToolsAgent):

  • public/WebMemoryUsageInfo.h: Added.

(WebKit):
(WebKit::WebMemoryUsageInfo::WebMemoryUsageInfo):
(WebMemoryUsageInfo):

  • src/WebDevToolsAgentImpl.cpp:

(WebKit::WebDevToolsAgentImpl::processMemoryDistribution):
(WebKit):

  • src/WebDevToolsAgentImpl.h:

(WebKit):
(WebDevToolsAgentImpl):

Location:
trunk/Source/WebKit/chromium
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r140937 r140951  
     12013-01-28  Marja Hölttä  <marja@chromium.org>
     2
     3        Add an API for retrieving native memory information without going through the remote inspecting protocol
     4        https://bugs.webkit.org/show_bug.cgi?id=107651
     5
     6        Reviewed by Adam Barth.
     7
     8        * WebKit.gyp:
     9        * public/WebDevToolsAgent.h:
     10        (WebKit):
     11        (WebDevToolsAgent):
     12        * public/WebMemoryUsageInfo.h: Added.
     13        (WebKit):
     14        (WebKit::WebMemoryUsageInfo::WebMemoryUsageInfo):
     15        (WebMemoryUsageInfo):
     16        * src/WebDevToolsAgentImpl.cpp:
     17        (WebKit::WebDevToolsAgentImpl::processMemoryDistribution):
     18        (WebKit):
     19        * src/WebDevToolsAgentImpl.h:
     20        (WebKit):
     21        (WebDevToolsAgentImpl):
     22
    1232013-01-27  Sheriff Bot  <webkit.review.bot@gmail.com>
    224

  • trunk/Source/WebKit/chromium/WebKit.gyp

    r140621 r140951  
    205205                'public/WebMediaPlayerClient.h',
    206206                'public/WebMediaStreamRegistry.h',
     207                'public/WebMemoryUsageInfo.h',
    207208                'public/WebMenuItemInfo.h',
    208209                'public/WebNavigationType.h',

  • trunk/Source/WebKit/chromium/public/WebDevToolsAgent.h

    r140621 r140951  
    3333
    3434#include "../../../Platform/chromium/public/WebCommon.h"
     35#include "../../../Platform/chromium/public/WebVector.h"
    3536
    3637namespace WebKit {
    … …  
    4445struct WebDevToolsMessageData;
    4546struct WebPoint;
     47struct WebMemoryUsageInfo;
    4648struct WebURLError;
    4749
    … …  
    7678    virtual void evaluateInWebInspector(long callId, const WebString& script) = 0;
    7779
     80    virtual WebVector<WebMemoryUsageInfo> processMemoryDistribution() const = 0;
     81
    7882    class MessageDescriptor {
    7983    public:

  • trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

    r139998 r140951  
    5656#include "WebDevToolsAgentClient.h"
    5757#include "WebFrameImpl.h"
     58#include "WebMemoryUsageInfo.h"
    5859#include "WebViewClient.h"
    5960#include "WebViewImpl.h"
    … …  
    636637}
    637638
     639WebVector<WebMemoryUsageInfo> WebDevToolsAgentImpl::processMemoryDistribution() const
     640{
     641    HashMap<String, size_t> memoryInfo = m_webViewImpl->page()->inspectorController()->processMemoryDistribution();
     642    WebVector<WebMemoryUsageInfo> memoryInfoVector((size_t)memoryInfo.size());
     643    size_t i = 0;
     644    for (HashMap<String, size_t>::const_iterator it = memoryInfo.begin(); it != memoryInfo.end(); ++it)
     645        memoryInfoVector[i++] = WebMemoryUsageInfo(it->key, it->value);
     646    return memoryInfoVector;
     647}
     648
    638649void WebDevToolsAgentImpl::highlight()
    639650{

  • trunk/Source/WebKit/chromium/src/WebDevToolsAgentImpl.h

    r138236 r140951  
    6262class WebURLResponse;
    6363class WebViewImpl;
     64struct WebMemoryUsageInfo;
    6465struct WebURLError;
    6566struct WebDevToolsMessageData;
    … …  
    118119    virtual void paintPageOverlay(WebCanvas*);
    119120
     121    virtual WebVector<WebMemoryUsageInfo> processMemoryDistribution() const;
     122
    120123private:
    121124    // WebThread::TaskObserver
Note: See TracChangeset for help on using the changeset viewer.