Title: [118368] trunk/Source/WebCore
- Revision
- 118368
- Author
- [email protected]
- Date
- 2012-05-24 07:38:19 -0700 (Thu, 24 May 2012)
Log Message
Unreviewed. Chromium Mac build fix after r118357.
Use full name specifier instead of "using" directive.
* inspector/InspectorMemoryAgent.cpp:
(WebCore::jsHeapInfo):
(WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (118367 => 118368)
--- trunk/Source/WebCore/ChangeLog 2012-05-24 14:35:50 UTC (rev 118367)
+++ trunk/Source/WebCore/ChangeLog 2012-05-24 14:38:19 UTC (rev 118368)
@@ -1,3 +1,12 @@
+2012-05-24 Yury Semikhatsky <[email protected]>
+
+ Unreviewed. Chromium Mac build fix after r118357.
+ Use full name specifier instead of "using" directive.
+
+ * inspector/InspectorMemoryAgent.cpp:
+ (WebCore::jsHeapInfo):
+ (WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
+
2012-05-24 Pavel Feldman <[email protected]>
Web Inspector: introduce virtual resource for inspector stylesheet.
Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp (118367 => 118368)
--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2012-05-24 14:35:50 UTC (rev 118367)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2012-05-24 14:38:19 UTC (rev 118368)
@@ -56,7 +56,6 @@
using WebCore::TypeBuilder::Memory::DOMGroup;
using WebCore::TypeBuilder::Memory::ListenerCount;
-using WebCore::TypeBuilder::Memory::MemoryBlock;
using WebCore::TypeBuilder::Memory::NodeCount;
using WebCore::TypeBuilder::Memory::StringStatistics;
@@ -318,18 +317,18 @@
strings = counterVisitor.strings();
}
-static PassRefPtr<MemoryBlock> jsHeapInfo()
+static PassRefPtr<WebCore::TypeBuilder::Memory::MemoryBlock> jsHeapInfo()
{
size_t usedJSHeapSize;
size_t totalJSHeapSize;
size_t jsHeapSizeLimit;
ScriptGCEvent::getHeapSize(usedJSHeapSize, totalJSHeapSize, jsHeapSizeLimit);
- RefPtr<MemoryBlock> totalJsHeap = MemoryBlock::create().setName(MemoryBlockName::totalJsHeap);
+ RefPtr<WebCore::TypeBuilder::Memory::MemoryBlock> totalJsHeap = WebCore::TypeBuilder::Memory::MemoryBlock::create().setName(MemoryBlockName::totalJsHeap);
totalJsHeap->setSize(totalJSHeapSize);
- RefPtr<TypeBuilder::Array<MemoryBlock> > children = TypeBuilder::Array<MemoryBlock>::create();
- RefPtr<MemoryBlock> usedJsHeap = MemoryBlock::create().setName(MemoryBlockName::usedJsHeap);
+ RefPtr<TypeBuilder::Array<WebCore::TypeBuilder::Memory::MemoryBlock> > children = TypeBuilder::Array<WebCore::TypeBuilder::Memory::MemoryBlock>::create();
+ RefPtr<WebCore::TypeBuilder::Memory::MemoryBlock> usedJsHeap = WebCore::TypeBuilder::Memory::MemoryBlock::create().setName(MemoryBlockName::usedJsHeap);
usedJsHeap->setSize(usedJSHeapSize);
children->addItem(usedJsHeap);
@@ -337,17 +336,17 @@
return totalJsHeap.release();
}
-void InspectorMemoryAgent::getProcessMemoryDistribution(ErrorString*, RefPtr<MemoryBlock>& processMemory)
+void InspectorMemoryAgent::getProcessMemoryDistribution(ErrorString*, RefPtr<WebCore::TypeBuilder::Memory::MemoryBlock>& processMemory)
{
size_t privateBytes = 0;
#if PLATFORM(CHROMIUM)
size_t sharedBytes = 0;
PlatformSupport::getProcessMemorySize(&privateBytes, &sharedBytes);
#endif
- processMemory = MemoryBlock::create().setName(MemoryBlockName::processPrivateMemory);
+ processMemory = WebCore::TypeBuilder::Memory::MemoryBlock::create().setName(MemoryBlockName::processPrivateMemory);
processMemory->setSize(privateBytes);
- RefPtr<TypeBuilder::Array<MemoryBlock> > children = TypeBuilder::Array<MemoryBlock>::create();
+ RefPtr<TypeBuilder::Array<WebCore::TypeBuilder::Memory::MemoryBlock> > children = TypeBuilder::Array<WebCore::TypeBuilder::Memory::MemoryBlock>::create();
children->addItem(jsHeapInfo());
processMemory->setChildren(children);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
