Log Message
Unreviewed, rolling out r142081. http://trac.webkit.org/changeset/142081 https://bugs.webkit.org/show_bug.cgi?id=109146
The patch caused a crash in inspector-protocol/nmi-webaudio*.html . See http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=inspector-protocol%2Fnmi-webaudio-leak-test.html and http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=inspector-protocol%2Fnmi-webaudio.html . * dom/WebCoreMemoryInstrumentation.cpp: (WebCore): * inspector/front-end/NativeMemorySnapshotView.js: (WebInspector.MemoryBlockViewProperties._initialize): * platform/PlatformMemoryInstrumentation.cpp: (WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (142165 => 142166)
--- trunk/Source/WebCore/ChangeLog 2013-02-07 20:58:25 UTC (rev 142165)
+++ trunk/Source/WebCore/ChangeLog 2013-02-07 21:03:24 UTC (rev 142166)
@@ -1,3 +1,20 @@
+2013-02-07 Gavin Peters <[email protected]>
+
+ Unreviewed, rolling out r142081.
+ http://trac.webkit.org/changeset/142081
+ https://bugs.webkit.org/show_bug.cgi?id=109146
+
+ The patch caused a crash in inspector-protocol/nmi-webaudio*.html .
+
+ See http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=inspector-protocol%2Fnmi-webaudio-leak-test.html and http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=inspector-protocol%2Fnmi-webaudio.html .
+
+ * dom/WebCoreMemoryInstrumentation.cpp:
+ (WebCore):
+ * inspector/front-end/NativeMemorySnapshotView.js:
+ (WebInspector.MemoryBlockViewProperties._initialize):
+ * platform/PlatformMemoryInstrumentation.cpp:
+ (WebCore):
+
2013-02-07 Bear Travis <[email protected]>
[CSS Exclusions] shape-inside does not properly handle padding or border
Modified: trunk/Source/WebCore/dom/WebCoreMemoryInstrumentation.cpp (142165 => 142166)
--- trunk/Source/WebCore/dom/WebCoreMemoryInstrumentation.cpp 2013-02-07 20:58:25 UTC (rev 142165)
+++ trunk/Source/WebCore/dom/WebCoreMemoryInstrumentation.cpp 2013-02-07 21:03:24 UTC (rev 142166)
@@ -36,43 +36,43 @@
namespace WebCore {
-MemoryObjectType WebCoreMemoryTypes::Page = "DOM";
-MemoryObjectType WebCoreMemoryTypes::DOM = "DOM";
-MemoryObjectType WebCoreMemoryTypes::CSS = "CSS";
-MemoryObjectType WebCoreMemoryTypes::Binding = "DOM";
-MemoryObjectType WebCoreMemoryTypes::RenderingStructures = "Rendering";
+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::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::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::ExternalStrings = "JSExternalResources";
-MemoryObjectType WebCoreMemoryTypes::ExternalArrays = "JSExternalResources";
+MemoryObjectType WebCoreMemoryTypes::ExternalStrings = "JSExternalResources.Strings";
+MemoryObjectType WebCoreMemoryTypes::ExternalArrays = "JSExternalResources.Arrays";
MemoryObjectType WebCoreMemoryTypes::Inspector = "WebInspector";
-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::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::JSHeapUsed = "JSHeap.Used";
MemoryObjectType WebCoreMemoryTypes::JSHeapUnused = "JSHeap.Unused";
MemoryObjectType WebCoreMemoryTypes::DOMStorageCache = "DOMStorageCache";
-MemoryObjectType WebCoreMemoryTypes::RenderTreeUsed = "RenderTree";
-MemoryObjectType WebCoreMemoryTypes::RenderTreeUnused = "RenderTree";
+MemoryObjectType WebCoreMemoryTypes::RenderTreeUsed = "RenderTree.Used";
+MemoryObjectType WebCoreMemoryTypes::RenderTreeUnused = "RenderTree.Unused";
MemoryObjectType WebCoreMemoryTypes::ProcessPrivateMemory = "ProcessPrivateMemory";
Modified: trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js (142165 => 142166)
--- trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js 2013-02-07 20:58:25 UTC (rev 142165)
+++ trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js 2013-02-07 21:03:24 UTC (rev 142166)
@@ -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%)", "Image", "Images");
+ addBlock("hsl(220, 80%, 70%)", "Page", "Page structures");
addBlock("hsl(100, 60%, 50%)", "JSHeap", "_javascript_ heap");
addBlock("hsl( 90, 40%, 80%)", "JSExternalResources", "_javascript_ external resources");
- addBlock("hsl( 90, 60%, 80%)", "CSS", "CSS");
- addBlock("hsl( 0, 50%, 60%)", "DOM", "DOM");
+ addBlock("hsl( 90, 60%, 80%)", "JSExternalArrays", "_javascript_ external arrays");
+ addBlock("hsl( 90, 60%, 80%)", "JSExternalStrings", "_javascript_ external strings");
addBlock("hsl( 0, 80%, 60%)", "WebInspector", "Inspector data");
- addBlock("hsl( 36, 90%, 50%)", "Resources", "Resources");
+ addBlock("hsl( 36, 90%, 50%)", "MemoryCache", "Memory cache 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 (142165 => 142166)
--- trunk/Source/WebCore/platform/PlatformMemoryInstrumentation.cpp 2013-02-07 20:58:25 UTC (rev 142165)
+++ trunk/Source/WebCore/platform/PlatformMemoryInstrumentation.cpp 2013-02-07 21:03:24 UTC (rev 142166)
@@ -37,13 +37,13 @@
namespace WebCore {
-MemoryObjectType PlatformMemoryTypes::Image = "Image";
-MemoryObjectType PlatformMemoryTypes::Loader = "Resources";
-MemoryObjectType PlatformMemoryTypes::Rendering = "Rendering";
-MemoryObjectType PlatformMemoryTypes::Layers = "Rendering";
+MemoryObjectType PlatformMemoryTypes::Image = "Page.Image";
+MemoryObjectType PlatformMemoryTypes::Loader = "Page.Loader";
+MemoryObjectType PlatformMemoryTypes::Rendering = "Page.Rendering";
+MemoryObjectType PlatformMemoryTypes::Layers = "Page.Rendering.Layers";
-MemoryObjectType PlatformMemoryTypes::Audio = "Audio";
-MemoryObjectType PlatformMemoryTypes::AudioSharedData = "Audio";
+MemoryObjectType PlatformMemoryTypes::Audio = "Page.Audio";
+MemoryObjectType PlatformMemoryTypes::AudioSharedData = "Page.Audio.SharedData";
void PlatformMemoryInstrumentation::reportStaticMembersMemoryUsage(WTF::MemoryInstrumentation* memoryInstrumentation)
{
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
