From 8878fab468e8de548f75c8cf1ec1b1fa308ee7eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Thu, 27 Jun 2013 15:20:18 +0200
Subject: [PATCH] Bug 887314 - The camera icon is distorted on a retina screen,
 r=mixedpuppy.

---
 browser/base/content/socialchat.xml       | 6 +++---
 browser/themes/shared/social/chat.inc.css | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/socialchat.xml b/browser/base/content/socialchat.xml
index e503268eeb6..9c7f6a68f2b 100644
--- a/browser/base/content/socialchat.xml
+++ b/browser/base/content/socialchat.xml
@@ -12,8 +12,8 @@
           <xul:image class="chat-status-icon" xbl:inherits="src=image"/>
           <xul:label class="chat-title" flex="1" xbl:inherits="value=label" crop="center"/>
         </xul:hbox>
-        <xul:toolbarbutton id="notification-icon" class="notification-anchor-icon chat-toolbarbutton"
-                   oncommand="document.getBindingParent(this).showNotifications(); event.stopPropagation();"/>
+        <xul:toolbarbutton anonid="notification-icon" class="notification-anchor-icon chat-toolbarbutton"
+                           oncommand="document.getBindingParent(this).showNotifications(); event.stopPropagation();"/>
         <xul:toolbarbutton anonid="minimize" class="chat-minimize-button chat-toolbarbutton"
                            oncommand="document.getBindingParent(this).toggle();"/>
         <xul:toolbarbutton anonid="swap" class="chat-swap-button chat-toolbarbutton"
@@ -32,7 +32,7 @@
       <constructor><![CDATA[
         let Social = Components.utils.import("resource:///modules/Social.jsm", {}).Social;
         this.content.__defineGetter__("popupnotificationanchor",
-                                      () => document.getAnonymousElementByAttribute(this, "id", "notification-icon"));
+                                      () => document.getAnonymousElementByAttribute(this, "anonid", "notification-icon"));
         Social.setErrorListener(this.content, function(aBrowser) {
           aBrowser.webNavigation.loadURI("about:socialerror?mode=compactInfo", null, null, null, null);
         });
diff --git a/browser/themes/shared/social/chat.inc.css b/browser/themes/shared/social/chat.inc.css
index 6d5045e81d1..8154704d1c1 100644
--- a/browser/themes/shared/social/chat.inc.css
+++ b/browser/themes/shared/social/chat.inc.css
@@ -22,6 +22,11 @@
   display: none;
 }
 
+.chat-toolbarbutton.notification-anchor-icon > .toolbarbutton-icon {
+  width: inherit;
+  margin-top: -2px;
+}
+
 .chat-close-button {
   list-style-image: url('chrome://browser/skin/social/chat-icons.png');
   -moz-image-region: rect(0, 14px, 14px, 0);