Changeset 125185 in webkit

Timestamp:

Aug 9, 2012 10:37:06 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: DocumentEventQueue memory instrumentation
​https://bugs.webkit.org/show_bug.cgi?id=93604

Reviewed by Pavel Feldman.

Provided DocumentEventQueue:: reportMemoryUsage implementation.

• dom/Document.cpp:

(WebCore::Document::reportMemoryUsage):

• dom/DocumentEventQueue.cpp:

(WebCore::DocumentEventQueue::reportMemoryUsage):
(WebCore):

• dom/DocumentEventQueue.h:

(WebCore):

• dom/Event.cpp:

(WebCore::Event::reportMemoryUsage):
(WebCore):

• dom/Event.h:

(WebCore):
(Event):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• dom/DocumentEventQueue.cpp (modified) (2 diffs)
• dom/DocumentEventQueue.h (modified) (2 diffs)
• dom/Event.cpp (modified) (1 diff)
• dom/Event.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-09  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: DocumentEventQueue memory instrumentation
+        https://bugs.webkit.org/show_bug.cgi?id=93604
+
+        Reviewed by Pavel Feldman.
+
+        Provided DocumentEventQueue:: reportMemoryUsage implementation.
+
+        * dom/Document.cpp:
+        (WebCore::Document::reportMemoryUsage):
+        * dom/DocumentEventQueue.cpp:
+        (WebCore::DocumentEventQueue::reportMemoryUsage):
+        (WebCore):
+        * dom/DocumentEventQueue.h:
+        (WebCore):
+        * dom/Event.cpp:
+        (WebCore::Event::reportMemoryUsage):
+        (WebCore):
+        * dom/Event.h:
+        (WebCore):
+        (Event):
+
 2012-08-09  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -6125 +6125 @@
     info.addHashSet(m_privateBrowsingStateChangedElements);
     info.addHashMap(m_elementsByAccessKey);
+    info.addInstrumentedMember(m_eventQueue);
     info.addHashSet(m_mediaCanStartListeners);
     info.addVector(m_pendingTasks);

trunk/Source/WebCore/dom/DocumentEventQueue.cpp

@@ -32 +32 @@
 #include "Event.h"
 #include "EventNames.h"
+#include "MemoryInstrumentation.h"
 #include "RuntimeApplicationChecks.h"
 #include "ScriptExecutionContext.h"
@@ -108 +109 @@
 }
 
+void DocumentEventQueue::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::DOM);
+    info.addMember(m_pendingEventTimer);
+    info.addInstrumentedHashSet(m_queuedEvents);
+    info.addInstrumentedHashSet(m_nodesWithQueuedScrollEvents);
+}
+
 bool DocumentEventQueue::cancelEvent(Event* event)
 {

trunk/Source/WebCore/dom/DocumentEventQueue.h

@@ -39 +39 @@
 class Event;
 class DocumentEventQueueTimer;
+class MemoryObjectInfo;
 class Node;
 class ScriptExecutionContext;
@@ -59 +60 @@
     void enqueueOrDispatchScrollEvent(PassRefPtr<Node>, ScrollEventTargetType);
 
+    void reportMemoryUsage(MemoryObjectInfo*) const;
+
 private:
     explicit DocumentEventQueue(ScriptExecutionContext*);

trunk/Source/WebCore/dom/Event.cpp

@@ -156 +156 @@
 }
 
+void Event::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo info(memoryObjectInfo, this, MemoryInstrumentation::DOM);
+    info.addMember(m_type);
+    info.addMember(m_currentTarget);
+    info.addMember(m_target);
+    info.addInstrumentedMember(m_underlyingEvent);
+}
+
 void Event::setTarget(PassRefPtr<EventTarget> target)
 {

trunk/Source/WebCore/dom/Event.h

@@ -32 +32 @@
 namespace WebCore {
 
+    class MemoryInstrumentation;
     class EventTarget;
     class EventDispatcher;
@@ -153 +154 @@
         bool isBeingDispatched() const { return eventPhase(); }
 
+        virtual void reportMemoryUsage(MemoryObjectInfo*) const;
+
     protected:
         Event();