Changeset 132998 in webkit

Timestamp:

Oct 31, 2012, 1:36:11 AM (13 years ago)

Author:

yurys@chromium.org

Message:

Memory instrumentation: do not report memory occupied by objects referenced using client interfaces
​https://bugs.webkit.org/show_bug.cgi?id=100824

Reviewed by Alexander Pavlov.

In many classes we have pointer to a client object. These references should be
reported as weak pointers and the client's memory usage should be reported when
the client is reached from its instrumented owner where we know exact type of
the client. Otherwise we would need to add reportMemoryUsage to all client
interfaces which places additional burden on the client implementers and blurs
the instrumentation boundaries.

• inspector/InspectorController.cpp:

(WebCore::InspectorController::reportMemoryUsage):

• inspector/InspectorDebuggerAgent.cpp:

(WebCore::InspectorDebuggerAgent::reportMemoryUsage):

• inspector/InspectorMemoryAgent.cpp:

(WebCore::InspectorMemoryAgent::reportMemoryUsage):

• inspector/InspectorOverlay.cpp:

(WebCore::InspectorOverlay::reportMemoryUsage):

• inspector/InspectorResourceAgent.cpp:

(WebCore::InspectorResourceAgent::reportMemoryUsage):

• page/Page.cpp:

(WebCore::Page::reportMemoryUsage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (1 diff)
• inspector/InspectorDebuggerAgent.cpp (modified) (1 diff)
• inspector/InspectorMemoryAgent.cpp (modified) (1 diff)
• inspector/InspectorOverlay.cpp (modified) (1 diff)
• inspector/InspectorResourceAgent.cpp (modified) (1 diff)
• page/Page.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-31  Yury Semikhatsky  <yurys@chromium.org>
+
+        Memory instrumentation: do not report memory occupied by objects referenced using client interfaces
+        https://bugs.webkit.org/show_bug.cgi?id=100824
+
+        Reviewed by Alexander Pavlov.
+
+        In many classes we have pointer to a client object. These references should be
+        reported as weak pointers and the client's memory usage should be reported when
+        the client is reached from its instrumented owner where we know exact type of
+        the client. Otherwise we would need to add reportMemoryUsage to all client
+        interfaces which places additional burden on the client implementers and blurs
+        the instrumentation boundaries.
+
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::reportMemoryUsage):
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::reportMemoryUsage):
+        * inspector/InspectorMemoryAgent.cpp:
+        (WebCore::InspectorMemoryAgent::reportMemoryUsage):
+        * inspector/InspectorOverlay.cpp:
+        (WebCore::InspectorOverlay::reportMemoryUsage):
+        * inspector/InspectorResourceAgent.cpp:
+        (WebCore::InspectorResourceAgent::reportMemoryUsage):
+        * page/Page.cpp:
+        (WebCore::Page::reportMemoryUsage):
+
 2012-10-31  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/inspector/InspectorController.cpp

@@ -405 +405 @@
     info.addMember(m_inspectorFrontend);
     info.addMember(m_page);
-    info.addMember(m_inspectorClient);
+    info.addWeakPointer(m_inspectorClient);
     info.addMember(m_agents);
 }

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -749 +749 @@
     info.addMember(m_continueToLocationBreakpointId);
     info.addMember(m_breakAuxData);
-    info.addMember(m_listener);
+    info.addWeakPointer(m_listener);
 }
 

trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

@@ -560 +560 @@
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Inspector);
     InspectorBaseAgent<InspectorMemoryAgent>::reportMemoryUsage(memoryObjectInfo);
-    info.addMember(m_inspectorClient);
+    info.addWeakPointer(m_inspectorClient);
     info.addMember(m_page);
 }

trunk/Source/WebCore/inspector/InspectorOverlay.cpp

@@ -505 +505 @@
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::InspectorOverlay);
     info.addMember(m_page);
-    info.addMember(m_client);
+    info.addWeakPointer(m_client);
     info.addMember(m_pausedInDebuggerMessage);
     info.addMember(m_highlightNode);

trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp

@@ -675 +675 @@
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::InspectorResourceAgent);
     InspectorBaseAgent<InspectorResourceAgent>::reportMemoryUsage(memoryObjectInfo);
-    info.addMember(m_pageAgent);
-    info.addMember(m_client);
+    info.addWeakPointer(m_pageAgent);
+    info.addWeakPointer(m_client);
     info.addWeakPointer(m_frontend);
     info.addMember(m_userAgentOverride);

trunk/Source/WebCore/page/Page.cpp

@@ -1296 +1296 @@
     info.addMember(m_pluginData);
     info.addMember(m_theme);
-    info.addMember(m_editorClient);
+    info.addWeakPointer(m_editorClient);
     info.addMember(m_featureObserver);
     info.addMember(m_groupName);
@@ -1309 +1309 @@
     info.addMember(m_relevantPaintedRegion);
     info.addMember(m_relevantUnpaintedRegion);
-    info.addMember(m_alternativeTextClient);
+    info.addWeakPointer(m_alternativeTextClient);
     info.addMember(m_seenPlugins);
 }