From c8ef9c976f1ea76c792f5ad7aa884dbef3b44a4b Mon Sep 17 00:00:00 2001
From: Jordan Santell <jsantell@mozilla.com>
Date: Wed, 28 Oct 2015 14:36:49 -0700
Subject: [PATCH] Bug 1213966 - Add memory tool active icon, and wire up both
 memory tool icons. r=fitzgen

---
 devtools/client/definitions.js                       | 3 ++-
 devtools/client/jar.mn                               | 2 ++
 devtools/client/themes/images/tool-memory-active.svg | 7 +++++++
 devtools/client/themes/images/tool-memory.svg        | 6 +++---
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 devtools/client/themes/images/tool-memory-active.svg

diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
index 0058a9e41c00..23cf3ffc92dc 100644
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -278,8 +278,9 @@ Tools.performance = {
 Tools.memory = {
   id: "memory",
   ordinal: 8,
-  icon: "chrome://devtools/skin/themes/images/tool-styleeditor.svg",
+  icon: "chrome://devtools/skin/themes/images/tool-memory.svg",
   invertIconForLightTheme: true,
+  highlightedicon: "chrome://devtools/skin/themes/images/tool-memory-active.svg",
   url: "chrome://devtools/content/memory/memory.xhtml",
   visibilityswitch: "devtools.memory.enabled",
   label: "Memory",
diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
index 9aec9a2c821d..6a0df97aa51c 100644
--- a/devtools/client/jar.mn
+++ b/devtools/client/jar.mn
@@ -302,6 +302,8 @@ devtools.jar:
     skin/themes/images/tool-network.svg (themes/images/tool-network.svg)
     skin/themes/images/tool-scratchpad.svg (themes/images/tool-scratchpad.svg)
     skin/themes/images/tool-webaudio.svg (themes/images/tool-webaudio.svg)
+    skin/themes/images/tool-memory.svg (themes/images/tool-memory.svg)
+    skin/themes/images/tool-memory-active.svg (themes/images/tool-memory-active.svg)
     skin/themes/images/close.png (themes/images/close.png)
     skin/themes/images/close@2x.png (themes/images/close@2x.png)
     skin/themes/images/vview-delete.png (themes/images/vview-delete.png)
diff --git a/devtools/client/themes/images/tool-memory-active.svg b/devtools/client/themes/images/tool-memory-active.svg
new file mode 100644
index 000000000000..e6db05588f80
--- /dev/null
+++ b/devtools/client/themes/images/tool-memory-active.svg
@@ -0,0 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="#71c054">
+  <path opacity="0.2" d="M5.8 3.9l4.9.1v8.3H5.8z"/>
+  <path d="M12.8 8L14 9.2c.1.1.3.2.5.2s.4-.1.5-.2c.3-.3.3-.8 0-1.1l-1.6-1.6c-.2-.2-.5-.3-.8-.2l-.6.4V5.3l.8-.3L14 6.2c.1.1.3.2.5.2s.4-.1.5-.2c.3-.3.3-.8 0-1.1l-1.6-1.6c-.2-.2-.5-.3-.8-.2l-.6.4V2.3c0-.2-.1-.3-.3-.3H4.3c-.2 0-.3.1-.3.3v1.5l-.8-.4c-.3-.1-.6-.1-.9.1L.8 5.1c-.3.3-.3.8 0 1.1.1.1.3.2.5.2s.4-.1.5-.2L3 5l1 .4v1.4l-.8-.4c-.3-.1-.6-.1-.9.1L.8 8.1c-.3.3-.3.8 0 1.1.1.1.3.2.5.2s.4-.1.5-.2L3 8l1 .4v1.4l-.8-.4c-.3-.1-.6-.1-.9.1L.7 11.1c-.3.3-.3.8 0 1.1.1.1.3.2.5.2s.4-.1.5-.2L3 11l1 .4v2.4c0 .1.1.2.3.2h7.5c.1 0 .3-.1.3-.3v-2.4l.8-.3 1.2 1.2c.1.1.3.2.5.2s.4-.1.5-.2c.3-.3.3-.8 0-1.1l-1.6-1.6c-.2-.2-.5-.3-.8-.2l-.7.4V8.3l.8-.3zM10 12H6V4h4v8z"/>
+</svg>
diff --git a/devtools/client/themes/images/tool-memory.svg b/devtools/client/themes/images/tool-memory.svg
index 146f4216b28d..227559b99798 100644
--- a/devtools/client/themes/images/tool-memory.svg
+++ b/devtools/client/themes/images/tool-memory.svg
@@ -2,6 +2,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="whitesmoke">
-    <path opacity="0.2" d="M5.8 3.9l4.9.1v8.3H5.8z"/>
-    <path d="M12.8 8L14 9.2c.1.1.3.2.5.2s.4-.1.5-.2c.3-.3.3-.8 0-1.1l-1.6-1.6c-.2-.2-.5-.3-.8-.2l-.6.4V5.3l.8-.3L14 6.2c.1.1.3.2.5.2s.4-.1.5-.2c.3-.3.3-.8 0-1.1l-1.6-1.6c-.2-.2-.5-.3-.8-.2l-.6.4V2.3c0-.2-.1-.3-.3-.3H4.3c-.2 0-.3.1-.3.3v1.5l-.8-.4c-.3-.1-.6-.1-.9.1L.8 5.1c-.3.3-.3.8 0 1.1.1.1.3.2.5.2s.4-.1.5-.2L3 5l1 .4v1.4l-.8-.4c-.3-.1-.6-.1-.9.1L.8 8.1c-.3.3-.3.8 0 1.1.1.1.3.2.5.2s.4-.1.5-.2L3 8l1 .4v1.4l-.8-.4c-.3-.1-.6-.1-.9.1L.7 11.1c-.3.3-.3.8 0 1.1.1.1.3.2.5.2s.4-.1.5-.2L3 11l1 .4v2.4c0 .1.1.2.3.2h7.5c.1 0 .3-.1.3-.3v-2.4l.8-.3 1.2 1.2c.1.1.3.2.5.2s.4-.1.5-.2c.3-.3.3-.8 0-1.1l-1.6-1.6c-.2-.2-.5-.3-.8-.2l-.7.4V8.3l.8-.3zM10 12H6V4h4v8z"/>
-</svg>
\ No newline at end of file
+  <path opacity="0.2" d="M5.8 3.9l4.9.1v8.3H5.8z"/>
+  <path d="M12.8 8L14 9.2c.1.1.3.2.5.2s.4-.1.5-.2c.3-.3.3-.8 0-1.1l-1.6-1.6c-.2-.2-.5-.3-.8-.2l-.6.4V5.3l.8-.3L14 6.2c.1.1.3.2.5.2s.4-.1.5-.2c.3-.3.3-.8 0-1.1l-1.6-1.6c-.2-.2-.5-.3-.8-.2l-.6.4V2.3c0-.2-.1-.3-.3-.3H4.3c-.2 0-.3.1-.3.3v1.5l-.8-.4c-.3-.1-.6-.1-.9.1L.8 5.1c-.3.3-.3.8 0 1.1.1.1.3.2.5.2s.4-.1.5-.2L3 5l1 .4v1.4l-.8-.4c-.3-.1-.6-.1-.9.1L.8 8.1c-.3.3-.3.8 0 1.1.1.1.3.2.5.2s.4-.1.5-.2L3 8l1 .4v1.4l-.8-.4c-.3-.1-.6-.1-.9.1L.7 11.1c-.3.3-.3.8 0 1.1.1.1.3.2.5.2s.4-.1.5-.2L3 11l1 .4v2.4c0 .1.1.2.3.2h7.5c.1 0 .3-.1.3-.3v-2.4l.8-.3 1.2 1.2c.1.1.3.2.5.2s.4-.1.5-.2c.3-.3.3-.8 0-1.1l-1.6-1.6c-.2-.2-.5-.3-.8-.2l-.7.4V8.3l.8-.3zM10 12H6V4h4v8z"/>
+</svg>