Title: [197971] trunk/Source/WebInspectorUI
Revision
197971
Author
[email protected]
Date
2016-03-10 16:44:20 -0800 (Thu, 10 Mar 2016)

Log Message

Web Inspector: Enable Memory Timelines by default if supported
https://bugs.webkit.org/show_bug.cgi?id=155333
<rdar://problem/25097319>

Reviewed by Timothy Hatcher.

* UserInterface/Controllers/TimelineManager.js:
(WebInspector.TimelineManager.defaultInstruments):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (197970 => 197971)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-03-11 00:43:46 UTC (rev 197970)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-03-11 00:44:20 UTC (rev 197971)
@@ -1,3 +1,14 @@
+2016-03-10  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Enable Memory Timelines by default if supported
+        https://bugs.webkit.org/show_bug.cgi?id=155333
+        <rdar://problem/25097319>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Controllers/TimelineManager.js:
+        (WebInspector.TimelineManager.defaultInstruments):
+
 2016-03-10  Matt Baker  <[email protected]>
 
         Web Inspector: Add "Quick Open" dialog to debugger and resources tabs

Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (197970 => 197971)


--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js	2016-03-11 00:43:46 UTC (rev 197970)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js	2016-03-11 00:44:20 UTC (rev 197971)
@@ -53,8 +53,12 @@
 
     static defaultInstruments()
     {
-        if (WebInspector.debuggableType === WebInspector.DebuggableType._javascript_)
-            return [new WebInspector.ScriptInstrument];
+        if (WebInspector.debuggableType === WebInspector.DebuggableType._javascript_) {
+            let defaults = [new WebInspector.ScriptInstrument];
+            if (WebInspector.HeapAllocationsInstrument.supported())
+                defaults.push(new WebInspector.HeapAllocationsInstrument);
+            return defaults;
+        }
 
         let defaults = [
             new WebInspector.NetworkInstrument,
@@ -62,6 +66,12 @@
             new WebInspector.ScriptInstrument,
         ];
 
+        if (WebInspector.MemoryInstrument.supported())
+            defaults.push(new WebInspector.MemoryInstrument);
+
+        if (WebInspector.HeapAllocationsInstrument.supported())
+            defaults.push(new WebInspector.HeapAllocationsInstrument);
+
         if (WebInspector.FPSInstrument.supported())
             defaults.push(new WebInspector.FPSInstrument);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to