1 files changed, 45 insertions, 28 deletions

diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index 8a78247..ef34f2c 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -420,7 +420,7 @@ body.port-qt #dock-status-bar-item {
     -webkit-mask-image: url(Images/consoleButtonGlyph.png);
 }
 
-#clear-console-status-bar-item .glyph {
+.clear-status-bar-item .glyph {
     -webkit-mask-image: url(Images/clearConsoleButtonGlyph.png);
 }
 
@@ -428,16 +428,12 @@ body.port-qt #dock-status-bar-item {
     -webkit-mask-image: url(Images/consoleButtonGlyph.png); /* TODO: Needs Image for Changes Toggle Button */
 }
 
-#clear-changes-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/clearConsoleButtonGlyph.png);
-}
-
-#count-items {
+#counters {
     position: absolute;
     right: 16px;
     top: 0;
     cursor: pointer;
-    padding: 6px 2px;
+    padding: 6px 2px 6px 0px;
     font-size: 10px;
     height: 19px;
 }
@@ -2713,6 +2709,15 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
     white-space: nowrap;
 }
 
+.memory-graph-label {
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    font-size: 9px;
+    color: rgb(50%, 50%, 50%);
+    white-space: nowrap;
+}
+
 .resources-graph-label {
     position: absolute;
     top: 0;
@@ -3338,7 +3343,7 @@ body.inactive .sidebar-tree-item.selected .bubble.search-matches {
     top: 0px;
     bottom: 0px;
     left: 0px;
-    padding-top: 1px;
+    padding-top: 2px;
     background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgb(242, 242, 242)), to(rgb(209, 209, 209)));
     border-right: 1px solid rgb(163, 163, 163);
 }
@@ -3422,13 +3427,9 @@ body.inactive .sidebar-tree-item.selected .bubble.search-matches {
     overflow-x: hidden;
 }
 
-.timeline-clear-status-bar-item .glyph {
-    -webkit-mask-image: url(Images/clearConsoleButtonGlyph.png);
-}
-
-.timeline-category-tree-item {
-    height: 20px;
-    line-height: 20px;
+.timeline-category-statusbar-item {
+    height: 24px;
+    line-height: 24px;
     padding-left: 6px;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -3436,7 +3437,7 @@ body.inactive .sidebar-tree-item.selected .bubble.search-matches {
     font-weight: bold;
 }
 
-.timeline-category-tree-item .timeline-category-checkbox {
+.timeline-category-statusbar-item .timeline-category-checkbox {
     width: 10px;
     height: 11px;
     margin: 0 3px 0 5px;
@@ -3448,26 +3449,22 @@ body.inactive .sidebar-tree-item.selected .bubble.search-matches {
     -webkit-appearance: none;
 }
 
-.timeline-category-tree-item .timeline-category-checkbox:checked {
+.timeline-category-statusbar-item .timeline-category-checkbox:checked {
     background-position-x: -10px;
 }
 
-.timeline-category-tree-item.timeline-category-loading .timeline-category-checkbox {
+.timeline-category-statusbar-item.timeline-category-loading .timeline-category-checkbox {
     background-position-y: 0;
 }
 
-.timeline-category-tree-item.timeline-category-scripting .timeline-category-checkbox {
+.timeline-category-statusbar-item.timeline-category-scripting .timeline-category-checkbox {
     background-position-y: -33px;
 }
 
-.timeline-category-tree-item.timeline-category-rendering .timeline-category-checkbox {
+.timeline-category-statusbar-item.timeline-category-rendering .timeline-category-checkbox {
     background-position-y: -11px;
 }
 
-.timeline-category-tree-item:nth-of-type(2n) {
-    background-color: rgba(0, 0, 0, 0.05);
-}
-
 .timeline-tree-item {
     height: 18px;
     line-height: 15px;
@@ -3533,14 +3530,25 @@ body.inactive .sidebar-tree-item.selected .bubble.search-matches {
     color: rgba(0, 0, 0, 0.7);
 }
 
-#timeline-overview-graphs {
+#timeline-overview-timelines,
+#timeline-overview-memory {
     position: absolute;
     left: 0;
     right: 0;
     bottom: 0;
     top: 20px;
+    z-index: 160;
+}
+
+#timeline-overview-memory > canvas {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 5px;
 }
 
+
 #timeline-graphs {
     position: absolute;
     left: 0;
@@ -3688,12 +3696,20 @@ body.inactive .sidebar-tree-item.selected .bubble.search-matches {
 
 .timeline-records-counter {
     font-size: 11px;
-    position: relative;
-    top: 5px;
-    margin-left: 5px;
     text-shadow: white 0 1px 0;
 }
 
+#main-status-bar > .timeline-records-counter {
+    float: right;
+    margin-top: 4px;
+    margin-right: 25px;
+}
+
+#counters > .timeline-records-counter {
+    float: left;
+    margin-top: -2px;
+}
+
 /* Profiler Style */
 
 #profile-views {
@@ -3704,6 +3720,7 @@ body.inactive .sidebar-tree-item.selected .bubble.search-matches {
     bottom: 0;
 }
 
+#timeline-view-status-bar-items,
 #profile-view-status-bar-items {
     position: absolute;
     top: 0;