Title: [134354] trunk/Source/WebCore
Revision
134354
Author
[email protected]
Date
2012-11-12 20:58:58 -0800 (Mon, 12 Nov 2012)

Log Message

Web Inspector: Add an option to switch display of "Other" memory on/off in NMI
https://bugs.webkit.org/show_bug.cgi?id=101601

Patch by Alexei Filippov <[email protected]> on 2012-11-12
Reviewed by Yury Semikhatsky.

* English.lproj/localizedStrings.js:
* inspector/front-end/NativeMemorySnapshotView.js:
* inspector/front-end/Settings.js:
* inspector/front-end/SettingsScreen.js:
(WebInspector.GenericSettingsTab):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (134353 => 134354)


--- trunk/Source/WebCore/ChangeLog	2012-11-13 04:55:49 UTC (rev 134353)
+++ trunk/Source/WebCore/ChangeLog	2012-11-13 04:58:58 UTC (rev 134354)
@@ -1,3 +1,16 @@
+2012-11-12  Alexei Filippov  <[email protected]>
+
+        Web Inspector: Add an option to switch display of "Other" memory on/off in NMI
+        https://bugs.webkit.org/show_bug.cgi?id=101601
+
+        Reviewed by Yury Semikhatsky.
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/NativeMemorySnapshotView.js:
+        * inspector/front-end/Settings.js:
+        * inspector/front-end/SettingsScreen.js:
+        (WebInspector.GenericSettingsTab):
+
 2012-11-10  Dirk Schulze  <[email protected]>
 
         BasicShapes 'circle', 'rectangle', 'ellipse' should be animatable with themselves

Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js (134353 => 134354)


--- trunk/Source/WebCore/English.lproj/localizedStrings.js	2012-11-13 04:55:49 UTC (rev 134353)
+++ trunk/Source/WebCore/English.lproj/localizedStrings.js	2012-11-13 04:58:58 UTC (rev 134354)
@@ -621,6 +621,7 @@
 localizedStrings["Open using %s"] = "Open using %s";
 localizedStrings["Open Using %s"] = "Open Using %s";
 localizedStrings["Show objects' hidden properties"] = "Show objects' hidden properties";
+localizedStrings["Show uninstrumented native memory"] = "Show uninstrumented native memory";
 localizedStrings["Remove All Breakpoints"] = "Remove All Breakpoints";
 localizedStrings["Remove all breakpoints"] = "Remove all breakpoints";
 localizedStrings["Remove All DOM Breakpoints"] = "Remove All DOM Breakpoints";

Modified: trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js (134353 => 134354)


--- trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js	2012-11-13 04:55:49 UTC (rev 134353)
+++ trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js	2012-11-13 04:58:58 UTC (rev 134354)
@@ -153,7 +153,9 @@
         if (this._nodeData !== this._profile)
             this._nodeData.children.sort(comparator);
         for (var node in this._nodeData.children) {
-            this.appendChild(new WebInspector.NativeSnapshotNode(this._nodeData.children[node], this._profile));
+            var nodeData = this._nodeData.children[node];
+            if (WebInspector.settings.showNativeSnapshotUninstrumentedSize.get() || nodeData.name !== "Other")
+                this.appendChild(new WebInspector.NativeSnapshotNode(nodeData, this._profile));
         }
     },
 

Modified: trunk/Source/WebCore/inspector/front-end/Settings.js (134353 => 134354)


--- trunk/Source/WebCore/inspector/front-end/Settings.js	2012-11-13 04:55:49 UTC (rev 134353)
+++ trunk/Source/WebCore/inspector/front-end/Settings.js	2012-11-13 04:58:58 UTC (rev 134354)
@@ -103,6 +103,7 @@
     this.geolocationOverride = this.createSetting("geolocationOverride", "");
     this.deviceOrientationOverride = this.createSetting("deviceOrientationOverride", "");
     this.showHeapSnapshotObjectsHiddenProperties = this.createSetting("showHeaSnapshotObjectsHiddenProperties", false);
+    this.showNativeSnapshotUninstrumentedSize = this.createSetting("showNativeSnapshotUninstrumentedSize", false);
     this.searchInContentScripts = this.createSetting("searchInContentScripts", false);
     this.textEditorIndent = this.createSetting("textEditorIndent", "    ");
     this.lastDockState = this.createSetting("lastDockState", "");

Modified: trunk/Source/WebCore/inspector/front-end/SettingsScreen.js (134353 => 134354)


--- trunk/Source/WebCore/inspector/front-end/SettingsScreen.js	2012-11-13 04:55:49 UTC (rev 134353)
+++ trunk/Source/WebCore/inspector/front-end/SettingsScreen.js	2012-11-13 04:58:58 UTC (rev 134354)
@@ -288,6 +288,8 @@
 
     p = this._appendSection(WebInspector.UIString("Profiler"));
     p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Show objects' hidden properties"), WebInspector.settings.showHeapSnapshotObjectsHiddenProperties));
+    if (WebInspector.experimentsSettings.nativeMemorySnapshots.isEnabled())
+        p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Show uninstrumented native memory"), WebInspector.settings.showNativeSnapshotUninstrumentedSize));
 
     p = this._appendSection(WebInspector.UIString("Timeline"));
     p.appendChild(this._createCheckboxSetting(WebInspector.UIString("Show CPU activity on the ruler"), WebInspector.settings.showCpuOnTimelineRuler));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to