Title: [145501] trunk/Source/WebCore
- Revision
- 145501
- Author
- yu...@chromium.org
- Date
- 2013-03-12 02:00:25 -0700 (Tue, 12 Mar 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145500 => 145501)
--- trunk/Source/WebCore/ChangeLog 2013-03-12 08:53:41 UTC (rev 145500)
+++ trunk/Source/WebCore/ChangeLog 2013-03-12 09:00:25 UTC (rev 145501)
@@ -1,3 +1,21 @@
+2013-03-12 Yury Semikhatsky <yu...@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 <vse...@chromium.org>
Web Inspector: Broken shortcuts in Snippets SourceFrame
Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (145500 => 145501)
--- trunk/Source/WebCore/loader/ImageLoader.cpp 2013-03-12 08:53:41 UTC (rev 145500)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2013-03-12 09:00:25 UTC (rev 145501)
@@ -37,6 +37,7 @@
#include "RenderImage.h"
#include "ScriptCallStack.h"
#include "SecurityOrigin.h"
+#include "WebCoreMemoryInstrumentation.h"
#if ENABLE(SVG)
#include "RenderSVGImage.h"
@@ -478,4 +479,13 @@
m_failedLoadURL = AtomicString();
}
+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");
}
+
+}
Modified: trunk/Source/WebCore/loader/ImageLoader.h (145500 => 145501)
--- trunk/Source/WebCore/loader/ImageLoader.h 2013-03-12 08:53:41 UTC (rev 145500)
+++ trunk/Source/WebCore/loader/ImageLoader.h 2013-03-12 09:00:25 UTC (rev 145501)
@@ -69,6 +69,8 @@
static void dispatchPendingLoadEvents();
static void dispatchPendingErrorEvents();
+ virtual void reportMemoryUsage(MemoryObjectInfo*) const;
+
protected:
virtual void notifyFinished(CachedResource*);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
