Changeset 145501 in webkit

Timestamp:

Mar 12, 2013, 2:00:25 AM (12 years ago)

Author:

yurys@chromium.org

Message:

Web Inspector: add memory instrumentation for ImageLoader
​https://bugs.webkit.org/show_bug.cgi?id=112115

Reviewed by Alexander Pavlov.

Added memory instrumentation to ImageLoader. CachedImage referenced
by the loader is reported as having retaining reference. This allows
to see in the native memory graph CachedImages that are not reachable
from MemoryCache but referenced by HTMLImageElement.

• loader/ImageLoader.cpp:

(WebCore::ImageLoader::reportMemoryUsage):
(WebCore):

• loader/ImageLoader.h:

(ImageLoader):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ImageLoader.cpp (modified) (2 diffs)
• loader/ImageLoader.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-12  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: add memory instrumentation for ImageLoader
+        https://bugs.webkit.org/show_bug.cgi?id=112115
+
+        Reviewed by Alexander Pavlov.
+
+        Added memory instrumentation to ImageLoader. CachedImage referenced
+        by the loader is reported as having retaining reference. This allows
+        to see in the native memory graph CachedImages that are not reachable
+        from MemoryCache but referenced by HTMLImageElement.
+
+        * loader/ImageLoader.cpp:
+        (WebCore::ImageLoader::reportMemoryUsage):
+        (WebCore):
+        * loader/ImageLoader.h:
+        (ImageLoader):
+
 2013-03-12  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/loader/ImageLoader.cpp

@@ -38 +38 @@
 #include "ScriptCallStack.h"
 #include "SecurityOrigin.h"
+#include "WebCoreMemoryInstrumentation.h"
 
 #if ENABLE(SVG)
@@ -479 +480 @@
 }
 
-}
+void ImageLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
+{
+    MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Image);
+    info.addMember(m_element, "element");
+    info.addMember(m_image.get(), "image", WTF::RetainingPointer);
+    info.addMember(m_derefElementTimer, "derefElementTimer");
+    info.addMember(m_failedLoadURL, "failedLoadURL");
+}
+
+}

trunk/Source/WebCore/loader/ImageLoader.h

@@ -70 +70 @@
     static void dispatchPendingErrorEvents();
 
+    virtual void reportMemoryUsage(MemoryObjectInfo*) const;
+
 protected:
     virtual void notifyFinished(CachedResource*);