Title: [198511] trunk/Source/WebInspectorUI
- Revision
- 198511
- Author
- mattba...@apple.com
- Date
- 2016-03-21 17:51:43 -0700 (Mon, 21 Mar 2016)
Log Message
Web Inspector: New icon for Heap Allocations timeline
https://bugs.webkit.org/show_bug.cgi?id=155731
<rdar://problem/25275494>
Reviewed by Joseph Pecoraro and Timothy Hatcher.
* UserInterface/Images/HeapAllocationsInstrument.svg: Added.
New artwork from Jon Davis.
* UserInterface/Views/TimelineIcons.css:
(.heap-allocations-icon .icon):
(body:not(.mac-platform, .windows-platform) .memory-icon .icon):
(body:not(.mac-platform, .windows-platform) .heap-allocations-icon .icon):
New icon styles/fallbacks for GTK.
* UserInterface/Views/TimelineTabContentView.js:
(WebInspector.TimelineTabContentView.iconClassNameForTimeline):
Add new icon class to UI helper method.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (198510 => 198511)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-22 00:51:17 UTC (rev 198510)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-22 00:51:43 UTC (rev 198511)
@@ -1,3 +1,24 @@
+2016-03-21 Matt Baker <mattba...@apple.com>
+
+ Web Inspector: New icon for Heap Allocations timeline
+ https://bugs.webkit.org/show_bug.cgi?id=155731
+ <rdar://problem/25275494>
+
+ Reviewed by Joseph Pecoraro and Timothy Hatcher.
+
+ * UserInterface/Images/HeapAllocationsInstrument.svg: Added.
+ New artwork from Jon Davis.
+
+ * UserInterface/Views/TimelineIcons.css:
+ (.heap-allocations-icon .icon):
+ (body:not(.mac-platform, .windows-platform) .memory-icon .icon):
+ (body:not(.mac-platform, .windows-platform) .heap-allocations-icon .icon):
+ New icon styles/fallbacks for GTK.
+
+ * UserInterface/Views/TimelineTabContentView.js:
+ (WebInspector.TimelineTabContentView.iconClassNameForTimeline):
+ Add new icon class to UI helper method.
+
2016-03-20 Dan Bernstein <m...@apple.com>
[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
Added: trunk/Source/WebInspectorUI/UserInterface/Images/HeapAllocationsInstrument.svg (0 => 198511)
--- trunk/Source/WebInspectorUI/UserInterface/Images/HeapAllocationsInstrument.svg (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/HeapAllocationsInstrument.svg 2016-03-22 00:51:43 UTC (rev 198511)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright © 2016 Apple Inc. All rights reserved. -->
+<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
+ <circle fill="rgb(224, 166, 133)" cx="8" cy="8" r="7.5" stroke="rgb(179, 114, 76)"/>
+ <path d="M 3.00628662 11.0028076 L 3 5 L 8 3 L 13 5.00280762 L 13 11.0028076 L 8 13 L 3.00628662 11.0028076 Z" stroke="rgb(179, 114, 76)"/>
+ <path d="M 3.00628662 5.00280762 L 8 7 L 8 13 L 3.00628662 11.0028076 L 3.00628662 5.00280762 Z M 8 7 L 8 13 L 13 11.0028076 L 13 5.00280762 L 8 7 Z M 8 3 L 13 5 L 8 7 L 3 5 L 8 3 Z" fill="white" stroke="rgb(179, 114, 76)" stroke-width="0.5" stroke-linejoin="bevel"/>
+</svg>
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css (198510 => 198511)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css 2016-03-22 00:51:17 UTC (rev 198510)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineIcons.css 2016-03-22 00:51:43 UTC (rev 198511)
@@ -35,6 +35,10 @@
content: url(../Images/MemoryInstrument.svg);
}
+.heap-allocations-icon .icon {
+ content: url(../Images/HeapAllocationsInstrument.svg);
+}
+
.layout-icon .icon {
content: url(../Images/LayoutInstrument.svg);
}
@@ -72,6 +76,14 @@
content: -webkit-image-set(url(../Images/Frames.png) 1x, url(../Images/fra...@2x.png) 2x);
}
+body:not(.mac-platform, .windows-platform) .memory-icon .icon {
+ content: -webkit-image-set(url(../Images/ScriptLarge.png) 1x, url(../Images/scriptla...@2x.png) 2x);
+}
+
+body:not(.mac-platform, .windows-platform) .heap-allocations-icon .icon {
+ content: -webkit-image-set(url(../Images/ScriptLarge.png) 1x, url(../Images/scriptla...@2x.png) 2x);
+}
+
.stopwatch-icon .icon {
content: url(../Images/Stopwatch.svg);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js (198510 => 198511)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-03-22 00:51:17 UTC (rev 198510)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-03-22 00:51:43 UTC (rev 198511)
@@ -137,8 +137,7 @@
case WebInspector.TimelineRecord.Type.Memory:
return "memory-icon";
case WebInspector.TimelineRecord.Type.HeapAllocations:
- // FIXME: HeapAllocation Timeline needs a new icon.
- return "memory-icon";
+ return "heap-allocations-icon";
case WebInspector.TimelineRecord.Type.Script:
return "script-icon";
case WebInspector.TimelineRecord.Type.RenderingFrame:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
