Title: [121002] trunk/Source/WebCore
- Revision
- 121002
- Author
- [email protected]
- Date
- 2012-06-21 21:07:42 -0700 (Thu, 21 Jun 2012)
Log Message
Web Inspector: Properly display native memory sizes bigger than 2GB
https://bugs.webkit.org/show_bug.cgi?id=89661
Patch by Alexei Filippov <[email protected]> on 2012-06-21
Reviewed by Pavel Feldman.
* inspector/Inspector.json:
* inspector/InspectorMemoryAgent.cpp:
(WebCore::jsHeapInfo):
(WebCore::inspectorData):
(WebCore::renderTreeInfo):
(WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121001 => 121002)
--- trunk/Source/WebCore/ChangeLog 2012-06-22 04:01:57 UTC (rev 121001)
+++ trunk/Source/WebCore/ChangeLog 2012-06-22 04:07:42 UTC (rev 121002)
@@ -1,3 +1,17 @@
+2012-06-21 Alexei Filippov <[email protected]>
+
+ Web Inspector: Properly display native memory sizes bigger than 2GB
+ https://bugs.webkit.org/show_bug.cgi?id=89661
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/Inspector.json:
+ * inspector/InspectorMemoryAgent.cpp:
+ (WebCore::jsHeapInfo):
+ (WebCore::inspectorData):
+ (WebCore::renderTreeInfo):
+ (WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
+
2012-06-21 Abhishek Arya <[email protected]>
Crash in RenderBlock::layoutPositionedObjects.
Modified: trunk/Source/WebCore/inspector/Inspector.json (121001 => 121002)
--- trunk/Source/WebCore/inspector/Inspector.json 2012-06-22 04:01:57 UTC (rev 121001)
+++ trunk/Source/WebCore/inspector/Inspector.json 2012-06-22 04:07:42 UTC (rev 121002)
@@ -92,7 +92,7 @@
"id": "MemoryBlock",
"type": "object",
"properties": [
- { "name": "size", "type": "integer", "optional": true, "description": "Size of the block in bytes if available" },
+ { "name": "size", "type": "number", "optional": true, "description": "Size of the block in bytes if available" },
{ "name": "name", "type": "string", "description": "Unique name used to identify the component that allocated this block" },
{ "name": "children", "type": "array", "optional": true, "items": { "$ref": "MemoryBlock" }}
]
Modified: trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp (121001 => 121002)
--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2012-06-22 04:01:57 UTC (rev 121001)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2012-06-22 04:07:42 UTC (rev 121002)
@@ -337,11 +337,11 @@
ScriptGCEvent::getHeapSize(usedJSHeapSize, totalJSHeapSize, jsHeapSizeLimit);
RefPtr<InspectorMemoryBlock> jsHeapAllocated = InspectorMemoryBlock::create().setName(MemoryBlockName::jsHeapAllocated);
- jsHeapAllocated->setSize(static_cast<int>(totalJSHeapSize));
+ jsHeapAllocated->setSize(totalJSHeapSize);
RefPtr<TypeBuilder::Array<InspectorMemoryBlock> > children = TypeBuilder::Array<InspectorMemoryBlock>::create();
RefPtr<InspectorMemoryBlock> jsHeapUsed = InspectorMemoryBlock::create().setName(MemoryBlockName::jsHeapUsed);
- jsHeapUsed->setSize(static_cast<int>(usedJSHeapSize));
+ jsHeapUsed->setSize(usedJSHeapSize);
children->addItem(jsHeapUsed);
jsHeapAllocated->setChildren(children);
@@ -352,7 +352,7 @@
{
size_t dataSize = ScriptProfiler::profilerSnapshotsSize();
RefPtr<InspectorMemoryBlock> inspectorData = InspectorMemoryBlock::create().setName(MemoryBlockName::inspectorData);
- inspectorData->setSize(static_cast<int>(dataSize));
+ inspectorData->setSize(dataSize);
return inspectorData.release();
}
@@ -361,11 +361,11 @@
ArenaSize arenaSize = page->renderTreeSize();
RefPtr<InspectorMemoryBlock> renderTreeAllocated = InspectorMemoryBlock::create().setName(MemoryBlockName::renderTreeAllocated);
- renderTreeAllocated->setSize(static_cast<int>(arenaSize.allocated));
+ renderTreeAllocated->setSize(arenaSize.allocated);
RefPtr<TypeBuilder::Array<InspectorMemoryBlock> > children = TypeBuilder::Array<InspectorMemoryBlock>::create();
RefPtr<InspectorMemoryBlock> renderTreeUsed = InspectorMemoryBlock::create().setName(MemoryBlockName::renderTreeUsed);
- renderTreeUsed->setSize(static_cast<int>(arenaSize.treeSize));
+ renderTreeUsed->setSize(arenaSize.treeSize);
children->addItem(renderTreeUsed);
renderTreeAllocated->setChildren(children);
@@ -406,7 +406,7 @@
size_t sharedBytes = 0;
MemoryUsageSupport::processMemorySizesInBytes(&privateBytes, &sharedBytes);
processMemory = InspectorMemoryBlock::create().setName(MemoryBlockName::processPrivateMemory);
- processMemory->setSize(static_cast<int>(privateBytes));
+ processMemory->setSize(privateBytes);
RefPtr<TypeBuilder::Array<InspectorMemoryBlock> > children = TypeBuilder::Array<InspectorMemoryBlock>::create();
children->addItem(jsHeapInfo());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
