Diff
Modified: trunk/Source/WebCore/ChangeLog (122086 => 122087)
--- trunk/Source/WebCore/ChangeLog 2012-07-09 04:56:36 UTC (rev 122086)
+++ trunk/Source/WebCore/ChangeLog 2012-07-09 04:59:12 UTC (rev 122087)
@@ -1,3 +1,21 @@
+2012-07-08 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r121968.
+ http://trac.webkit.org/changeset/121968
+ https://bugs.webkit.org/show_bug.cgi?id=90749
+
+ Caused a link error on chromium Win dbg. (Requested by hayato
+ on #webkit).
+
+ * inspector/InspectorMemoryAgent.cpp:
+ (WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
+ * inspector/front-end/NativeMemorySnapshotView.js:
+ (WebInspector.MemoryBlockViewProperties._initialize):
+ * platform/MemoryUsageSupport.cpp:
+ * platform/MemoryUsageSupport.h:
+ (MemoryUsageSupport):
+ * platform/chromium/MemoryUsageSupportChromium.cpp:
+
2012-07-08 Mary Wu <[email protected]>
[BlackBerry] Make setForceDownload a setter method.
Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp (122086 => 122087)
--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2012-07-09 04:56:36 UTC (rev 122086)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2012-07-09 04:59:12 UTC (rev 122087)
@@ -544,17 +544,6 @@
return domTreesIterator.dumpStatistics();
}
-static void addPlatformComponentsInfo(PassRefPtr<TypeBuilder::Array<InspectorMemoryBlock> > children)
-{
- Vector<MemoryUsageSupport::ComponentInfo> components;
- MemoryUsageSupport::memoryUsageByComponents(components);
- for (Vector<MemoryUsageSupport::ComponentInfo>::iterator it = components.begin(); it != components.end(); ++it) {
- RefPtr<InspectorMemoryBlock> block = InspectorMemoryBlock::create().setName(it->m_name);
- block->setSize(it->m_sizeInBytes);
- children->addItem(block);
- }
-}
-
static PassRefPtr<InspectorMemoryBlock> memoryCacheInfo()
{
MemoryCache::Statistics stats = memoryCache()->getStatistics();
@@ -613,7 +602,6 @@
children->addItem(renderTreeInfo(m_page)); // TODO: collect for all pages?
children->addItem(domTreeInfo(m_page, visitedObjects)); // TODO: collect for all pages?
children->addItem(jsExternalResourcesInfo(visitedObjects));
- addPlatformComponentsInfo(children);
processMemory->setChildren(children);
}
Modified: trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js (122086 => 122087)
--- trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js 2012-07-09 04:56:36 UTC (rev 122086)
+++ trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js 2012-07-09 04:59:12 UTC (rev 122087)
@@ -224,7 +224,6 @@
addBlock("hsl( 90, 50%, 80%)", "JSExternalStrings", "_javascript_ external strings");
addBlock("hsl(210, 60%, 80%)", "InspectorData", "Inspector data");
addBlock("hsl( 30, 60%, 80%)", "MemoryCache", "Memory cache resources");
- addBlock("hsl( 40, 60%, 80%)", "GlyphCache", "Glyph cache resources");
addBlock("hsl( 60, 60%, 80%)", "RenderTreeAllocated", "Render tree");
addBlock("hsl( 60, 60%, 80%)", "RenderTreeUsed", "Render tree used");
}
Modified: trunk/Source/WebCore/platform/MemoryUsageSupport.cpp (122086 => 122087)
--- trunk/Source/WebCore/platform/MemoryUsageSupport.cpp 2012-07-09 04:56:36 UTC (rev 122086)
+++ trunk/Source/WebCore/platform/MemoryUsageSupport.cpp 2012-07-09 04:59:12 UTC (rev 122087)
@@ -63,8 +63,4 @@
return false;
}
-void MemoryUsageSupport::memoryUsageByComponents(Vector<ComponentInfo>&)
-{
-}
-
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/MemoryUsageSupport.h (122086 => 122087)
--- trunk/Source/WebCore/platform/MemoryUsageSupport.h 2012-07-09 04:56:36 UTC (rev 122086)
+++ trunk/Source/WebCore/platform/MemoryUsageSupport.h 2012-07-09 04:59:12 UTC (rev 122087)
@@ -31,9 +31,6 @@
#ifndef MemoryUsageSupport_h
#define MemoryUsageSupport_h
-#include <wtf/Vector.h>
-#include <wtf/text/WTFString.h>
-
namespace WebCore {
class MemoryUsageSupport {
@@ -60,17 +57,6 @@
// memory currently allocated to this process that cannot be shared. Returns
// false on platform specific error conditions.
static bool processMemorySizesInBytes(size_t* privateBytes, size_t* sharedBytes);
-
- class ComponentInfo {
- public:
- ComponentInfo(const String& name, size_t size) : m_name(name), m_sizeInBytes(size) { }
-
- const String m_name;
- size_t m_sizeInBytes;
- };
-
- // Reports private memory used by components in bytes.
- static void memoryUsageByComponents(Vector<ComponentInfo>&);
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp (122086 => 122087)
--- trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp 2012-07-09 04:56:36 UTC (rev 122086)
+++ trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp 2012-07-09 04:59:12 UTC (rev 122087)
@@ -32,7 +32,6 @@
#include "MemoryUsageSupport.h"
#include <public/Platform.h>
-#include <third_party/skia/src/core/SkGlyphCache.h>
namespace WebCore {
@@ -66,18 +65,4 @@
return WebKit::Platform::current()->processMemorySizesInBytes(privateBytes, sharedBytes);
}
-static bool glyphCacheVisitor(SkGlyphCache* cache, void* context)
-{
- size_t* sizePtr = reinterpret_cast<size_t*>(context);
- *sizePtr += sizeof(*cache);
- return false;
-}
-
-void MemoryUsageSupport::memoryUsageByComponents(Vector<ComponentInfo>& components)
-{
- size_t size = 0;
- SkGlyphCache::VisitAllCaches(glyphCacheVisitor, &size);
- components.append(ComponentInfo("GlyphCache", size));
-}
-
} // namespace WebCore
