Diff
Modified: trunk/LayoutTests/ChangeLog (142238 => 142239)
--- trunk/LayoutTests/ChangeLog 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/LayoutTests/ChangeLog 2013-02-08 07:58:37 UTC (rev 142239)
@@ -1,3 +1,21 @@
+2013-02-07 Yury Semikhatsky <[email protected]>
+
+ Web Inspector: reduce number of native memory instrumentation categories
+ https://bugs.webkit.org/show_bug.cgi?id=109146
+
+ Reviewed by Pavel Feldman.
+
+ Updated tests to use new memory categories.
+
+ * inspector-protocol/nmi-webaudio-expected.txt:
+ * inspector-protocol/nmi-webaudio-leak-test-expected.txt:
+ * inspector-protocol/nmi-webaudio-leak-test.html:
+ * inspector-protocol/nmi-webaudio.html:
+ * inspector/profiler/memory-instrumentation-cached-images-expected.txt:
+ * inspector/profiler/memory-instrumentation-cached-images.html:
+ * inspector/profiler/memory-instrumentation-canvas-expected.txt:
+ * inspector/profiler/memory-instrumentation-canvas.html:
+
2013-02-07 Matt Falkenhagen <[email protected]>
[chromium] Unreviewed gardening. Flakiness on table-cell-before-after-content-around-table-row.html
Modified: trunk/LayoutTests/inspector/profiler/memory-instrumentation-cached-images-expected.txt (142238 => 142239)
--- trunk/LayoutTests/inspector/profiler/memory-instrumentation-cached-images-expected.txt 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/LayoutTests/inspector/profiler/memory-instrumentation-cached-images-expected.txt 2013-02-08 07:58:37 UTC (rev 142239)
@@ -1,5 +1,5 @@
This test checks that CachedImages size reported by the memory agent includes images decoded size. Bug 93366
-PASS: block size for path = [ProcessPrivateMemory, Page, Image] is OK.
+PASS: block size for path = [ProcessPrivateMemory, Image] is OK.
Modified: trunk/LayoutTests/inspector/profiler/memory-instrumentation-cached-images.html (142238 => 142239)
--- trunk/LayoutTests/inspector/profiler/memory-instrumentation-cached-images.html 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/LayoutTests/inspector/profiler/memory-instrumentation-cached-images.html 2013-02-08 07:58:37 UTC (rev 142239)
@@ -14,7 +14,7 @@
function test()
{
var jpegDecodedSizeExpected = 20000000;
- InspectorTest.validateMemoryBlockSize(["ProcessPrivateMemory", "Page", "Image"], jpegDecodedSizeExpected);
+ InspectorTest.validateMemoryBlockSize(["ProcessPrivateMemory", "Image"], jpegDecodedSizeExpected);
}
</script>
Modified: trunk/LayoutTests/inspector/profiler/memory-instrumentation-canvas-expected.txt (142238 => 142239)
--- trunk/LayoutTests/inspector/profiler/memory-instrumentation-canvas-expected.txt 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/LayoutTests/inspector/profiler/memory-instrumentation-canvas-expected.txt 2013-02-08 07:58:37 UTC (rev 142239)
@@ -1,4 +1,4 @@
This test checks that page's image size reported by the memory agent includes size of canvas internal image buffer.
- PASS: block size for path = [ProcessPrivateMemory, Page, Image] is OK.
+ PASS: block size for path = [ProcessPrivateMemory, Image] is OK.
Modified: trunk/LayoutTests/inspector/profiler/memory-instrumentation-canvas.html (142238 => 142239)
--- trunk/LayoutTests/inspector/profiler/memory-instrumentation-canvas.html 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/LayoutTests/inspector/profiler/memory-instrumentation-canvas.html 2013-02-08 07:58:37 UTC (rev 142239)
@@ -17,7 +17,7 @@
function test()
{
var canvasImageBufferExpected = 4000000;
- InspectorTest.validateMemoryBlockSize(["ProcessPrivateMemory", "Page", "Image"], canvasImageBufferExpected);
+ InspectorTest.validateMemoryBlockSize(["ProcessPrivateMemory", "Image"], canvasImageBufferExpected);
}
</script>
Modified: trunk/LayoutTests/inspector-protocol/nmi-webaudio-expected.txt (142238 => 142239)
--- trunk/LayoutTests/inspector-protocol/nmi-webaudio-expected.txt 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/LayoutTests/inspector-protocol/nmi-webaudio-expected.txt 2013-02-08 07:58:37 UTC (rev 142239)
@@ -1,3 +1,2 @@
-PASS: received size for type Page.Audio is more than 15000000
-PASS: received size for type Page.Audio.SharedData is more than 15000000
+PASS: received size for type Audio is more than 15000000
Modified: trunk/LayoutTests/inspector-protocol/nmi-webaudio-leak-test-expected.txt (142238 => 142239)
--- trunk/LayoutTests/inspector-protocol/nmi-webaudio-leak-test-expected.txt 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/LayoutTests/inspector-protocol/nmi-webaudio-leak-test-expected.txt 2013-02-08 07:58:37 UTC (rev 142239)
@@ -1,6 +1,6 @@
This test is checking that AudioContext is deleting after navigation. It is not possible to count AudioContext objects directly. But we could use Native Memory Snapshot which has information about Page.Audio.SharedData. All the shared data are retained by HRTFDatabaseLoader refcounted singleton and Native Memory Instrumentation is visiting it via public getter.
-Action: Wait for Page.Audio data
+Action: Wait for Audio data
PASS: Memory size for Page.Audio more than 15000000
Action: Navigate IFrame to resources/blank.html
PASS: IFrame was navigated to resources/blank.html
Modified: trunk/LayoutTests/inspector-protocol/nmi-webaudio-leak-test.html (142238 => 142239)
--- trunk/LayoutTests/inspector-protocol/nmi-webaudio-leak-test.html 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/LayoutTests/inspector-protocol/nmi-webaudio-leak-test.html 2013-02-08 07:58:37 UTC (rev 142239)
@@ -50,7 +50,7 @@
function noAudioSharedData(messageObject)
{
- var size = sizeForType(messageObject["result"]["distribution"], ["Page", "Audio"]);
+ var size = sizeForType(messageObject["result"]["distribution"], ["Audio"]);
if (size === -1)
InspectorTest.log("PASS: No Page.Audio data found");
else
@@ -66,7 +66,7 @@
}
function waitForSharedAudioData(messageObject) {
- var size = sizeForType(messageObject["result"]["distribution"], ["Page", "Audio"]);
+ var size = sizeForType(messageObject["result"]["distribution"], ["Audio"]);
if (size === -1) {
InspectorTest.log("FAIL: No Page.Audio data was found.");
InspectorTest.completeTest();
@@ -86,7 +86,7 @@
}
InspectorTest.log("");
- InspectorTest.log("Action: Wait for Page.Audio data");
+ InspectorTest.log("Action: Wait for Audio data");
InspectorTest.sendCommand('Memory.getProcessMemoryDistribution', {}, waitForSharedAudioData);
}
</script>
Modified: trunk/LayoutTests/inspector-protocol/nmi-webaudio.html (142238 => 142239)
--- trunk/LayoutTests/inspector-protocol/nmi-webaudio.html 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/LayoutTests/inspector-protocol/nmi-webaudio.html 2013-02-08 07:58:37 UTC (rev 142239)
@@ -72,8 +72,7 @@
if ("error" in messageObject)
InspectorTest.log(messageObject.error.message);
else
- receivedSizeMoreThan(messageObject, ["Page", "Audio"], 15000000);
- receivedSizeMoreThan(messageObject, ["Page", "Audio", "SharedData"], 15000000);
+ receivedSizeMoreThan(messageObject, ["Audio"], 15000000);
InspectorTest.completeTest();
}
Modified: trunk/Source/WebCore/ChangeLog (142238 => 142239)
--- trunk/Source/WebCore/ChangeLog 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/Source/WebCore/ChangeLog 2013-02-08 07:58:37 UTC (rev 142239)
@@ -1,3 +1,19 @@
+2013-02-07 Yury Semikhatsky <[email protected]>
+
+ Web Inspector: reduce number of native memory instrumentation categories
+ https://bugs.webkit.org/show_bug.cgi?id=109146
+
+ Reviewed by Pavel Feldman.
+
+ Merged some of memory instrumentation categories.
+
+ * dom/WebCoreMemoryInstrumentation.cpp:
+ (WebCore):
+ * inspector/front-end/NativeMemorySnapshotView.js:
+ (WebInspector.MemoryBlockViewProperties._initialize):
+ * platform/PlatformMemoryInstrumentation.cpp:
+ (WebCore):
+
2013-02-07 Mike West <[email protected]>
<iframe seamless> should avoid vertical scrollbars during the initial layout passes.
Modified: trunk/Source/WebCore/dom/WebCoreMemoryInstrumentation.cpp (142238 => 142239)
--- trunk/Source/WebCore/dom/WebCoreMemoryInstrumentation.cpp 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/Source/WebCore/dom/WebCoreMemoryInstrumentation.cpp 2013-02-08 07:58:37 UTC (rev 142239)
@@ -36,43 +36,43 @@
namespace WebCore {
-MemoryObjectType WebCoreMemoryTypes::Page = "Page";
-MemoryObjectType WebCoreMemoryTypes::DOM = "Page.DOM";
-MemoryObjectType WebCoreMemoryTypes::CSS = "Page.CSS";
-MemoryObjectType WebCoreMemoryTypes::Binding = "Page.Binding";
-MemoryObjectType WebCoreMemoryTypes::RenderingStructures = "Page.Rendering.Structures";
+MemoryObjectType WebCoreMemoryTypes::Page = "DOM";
+MemoryObjectType WebCoreMemoryTypes::DOM = "DOM";
+MemoryObjectType WebCoreMemoryTypes::CSS = "CSS";
+MemoryObjectType WebCoreMemoryTypes::Binding = "DOM";
+MemoryObjectType WebCoreMemoryTypes::RenderingStructures = "Rendering";
-MemoryObjectType WebCoreMemoryTypes::MemoryCacheStructures = "MemoryCache.InternalStructures";
-MemoryObjectType WebCoreMemoryTypes::CachedResource = "MemoryCache.Resource";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceRaw = "MemoryCache.RawResource";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceCSS = "MemoryCache.CSS";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceFont = "MemoryCache.Font";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceImage = "MemoryCache.Image";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceScript = "MemoryCache.Script";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceSVG = "MemoryCache.SVG";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceShader = "MemoryCache.Shader";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceXSLT = "MemoryCache.XSLT";
+MemoryObjectType WebCoreMemoryTypes::MemoryCacheStructures = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResource = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceRaw = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceCSS = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceFont = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceImage = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceScript = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceSVG = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceShader = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceXSLT = "Resources";
-MemoryObjectType WebCoreMemoryTypes::ExternalStrings = "JSExternalResources.Strings";
-MemoryObjectType WebCoreMemoryTypes::ExternalArrays = "JSExternalResources.Arrays";
+MemoryObjectType WebCoreMemoryTypes::ExternalStrings = "JSExternalResources";
+MemoryObjectType WebCoreMemoryTypes::ExternalArrays = "JSExternalResources";
MemoryObjectType WebCoreMemoryTypes::Inspector = "WebInspector";
-MemoryObjectType WebCoreMemoryTypes::InspectorController = "WebInspector.Controller";
-MemoryObjectType WebCoreMemoryTypes::InspectorMemoryAgent = "WebInspector.MemoryAgent";
-MemoryObjectType WebCoreMemoryTypes::InspectorDOMStorageAgent = "WebInspector.DOMStorageAgent";
-MemoryObjectType WebCoreMemoryTypes::InspectorDOMStorageResources = "WebInspector.DOMStorageAgent.Resources";
-MemoryObjectType WebCoreMemoryTypes::InspectorOverlay = "WebInspector.Overlay";
-MemoryObjectType WebCoreMemoryTypes::InspectorProfilerAgent = "WebInspector.ProfilerAgent";
-MemoryObjectType WebCoreMemoryTypes::InspectorDebuggerAgent = "WebInspector.DebuggerAgent";
-MemoryObjectType WebCoreMemoryTypes::InspectorResourceAgent = "WebInspector.ResourceAgent";
+MemoryObjectType WebCoreMemoryTypes::InspectorController = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorMemoryAgent = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorDOMStorageAgent = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorDOMStorageResources = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorOverlay = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorProfilerAgent = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorDebuggerAgent = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorResourceAgent = "WebInspector";
MemoryObjectType WebCoreMemoryTypes::JSHeapUsed = "JSHeap.Used";
MemoryObjectType WebCoreMemoryTypes::JSHeapUnused = "JSHeap.Unused";
MemoryObjectType WebCoreMemoryTypes::DOMStorageCache = "DOMStorageCache";
-MemoryObjectType WebCoreMemoryTypes::RenderTreeUsed = "RenderTree.Used";
-MemoryObjectType WebCoreMemoryTypes::RenderTreeUnused = "RenderTree.Unused";
+MemoryObjectType WebCoreMemoryTypes::RenderTreeUsed = "RenderTree";
+MemoryObjectType WebCoreMemoryTypes::RenderTreeUnused = "RenderTree";
MemoryObjectType WebCoreMemoryTypes::ProcessPrivateMemory = "ProcessPrivateMemory";
Modified: trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js (142238 => 142239)
--- trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js 2013-02-08 07:58:37 UTC (rev 142239)
@@ -628,13 +628,13 @@
addBlock("hsl( 0, 0%, 60%)", "ProcessPrivateMemory", "Total");
addBlock("hsl( 0, 0%, 80%)", "OwnersTypePlaceholder", "OwnersTypePlaceholder");
addBlock("hsl( 0, 0%, 60%)", "Other", "Other");
- addBlock("hsl(220, 80%, 70%)", "Page", "Page structures");
+ addBlock("hsl(220, 80%, 70%)", "Image", "Images");
addBlock("hsl(100, 60%, 50%)", "JSHeap", "_javascript_ heap");
addBlock("hsl( 90, 40%, 80%)", "JSExternalResources", "_javascript_ external resources");
- addBlock("hsl( 90, 60%, 80%)", "JSExternalArrays", "_javascript_ external arrays");
- addBlock("hsl( 90, 60%, 80%)", "JSExternalStrings", "_javascript_ external strings");
+ addBlock("hsl( 90, 60%, 80%)", "CSS", "CSS");
+ addBlock("hsl( 0, 50%, 60%)", "DOM", "DOM");
addBlock("hsl( 0, 80%, 60%)", "WebInspector", "Inspector data");
- addBlock("hsl( 36, 90%, 50%)", "MemoryCache", "Memory cache resources");
+ addBlock("hsl( 36, 90%, 50%)", "Resources", "Resources");
addBlock("hsl( 40, 80%, 80%)", "GlyphCache", "Glyph cache resources");
addBlock("hsl( 35, 80%, 80%)", "DOMStorageCache", "DOM storage cache");
addBlock("hsl( 60, 80%, 60%)", "RenderTree", "Render tree");
Modified: trunk/Source/WebCore/platform/PlatformMemoryInstrumentation.cpp (142238 => 142239)
--- trunk/Source/WebCore/platform/PlatformMemoryInstrumentation.cpp 2013-02-08 07:47:00 UTC (rev 142238)
+++ trunk/Source/WebCore/platform/PlatformMemoryInstrumentation.cpp 2013-02-08 07:58:37 UTC (rev 142239)
@@ -37,13 +37,13 @@
namespace WebCore {
-MemoryObjectType PlatformMemoryTypes::Image = "Page.Image";
-MemoryObjectType PlatformMemoryTypes::Loader = "Page.Loader";
-MemoryObjectType PlatformMemoryTypes::Rendering = "Page.Rendering";
-MemoryObjectType PlatformMemoryTypes::Layers = "Page.Rendering.Layers";
+MemoryObjectType PlatformMemoryTypes::Image = "Image";
+MemoryObjectType PlatformMemoryTypes::Loader = "Resources";
+MemoryObjectType PlatformMemoryTypes::Rendering = "Rendering";
+MemoryObjectType PlatformMemoryTypes::Layers = "Rendering";
-MemoryObjectType PlatformMemoryTypes::Audio = "Page.Audio";
-MemoryObjectType PlatformMemoryTypes::AudioSharedData = "Page.Audio.SharedData";
+MemoryObjectType PlatformMemoryTypes::Audio = "Audio";
+MemoryObjectType PlatformMemoryTypes::AudioSharedData = "Audio";
void PlatformMemoryInstrumentation::reportStaticMembersMemoryUsage(WTF::MemoryInstrumentation* memoryInstrumentation)
{
