commit 9c9b94f764495c8500093622c611029883badc97 Author: Arthur Edelstein arthuredelstein@gmail.com Date: Thu Apr 21 17:07:05 2016 -0700

fixup! Bug #13670.1: Isolate favicon requests by first party --- browser/base/content/tabbrowser.xml | 2 +- toolkit/content/widgets/menu.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 6afe7e8..1a92ae7 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -5928,7 +5928,7 @@ class="tab-throbber" role="presentation" layer="true" /> - <xul:image xbl:inherits="src=image,fadein,pinned,selected,visuallyselected,busy,crashed" + <xul:image xbl:inherits="src=image,fadein,pinned,selected,visuallyselected,busy,crashed,firstparty" anonid="tab-icon-image" class="tab-icon-image" validate="never" diff --git a/toolkit/content/widgets/menu.xml b/toolkit/content/widgets/menu.xml index 26dcad4..a9ba686 100644 --- a/toolkit/content/widgets/menu.xml +++ b/toolkit/content/widgets/menu.xml @@ -214,7 +214,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,_moz-menuactive,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> <children/> @@ -228,7 +228,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> </content> @@ -238,7 +238,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,crop" crop="right"/> </content> @@ -248,7 +248,7 @@ <content> <xul:hbox class="menu-iconic-left" align="center" pack="center" xbl:inherits="selected,disabled,checked"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" xbl:inherits="value=label,accesskey,crop" crop="right" flex="1"/> <xul:label class="menu-iconic-text menu-description" xbl:inherits="value=description" crop="right" flex="10000"/> @@ -259,7 +259,7 @@ extends="chrome://global/content/bindings/menu.xml#menu-base"> <content> <xul:hbox class="menu-iconic-left" align="center" pack="center"> - <xul:image class="menu-iconic-icon" xbl:inherits="src=image"/> + <xul:image class="menu-iconic-icon" xbl:inherits="src=image,firstparty"/> </xul:hbox> <xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop" crop="right"/> <xul:hbox class="menu-accel-container" anonid="accel">