Commit 8fdb652c authored by Florian Quèze's avatar Florian Quèze
Browse files

Bug 1531836 - only look for a window specific icon on the disk if an 'icon'...

Bug 1531836 - only look for a window specific icon on the disk if an 'icon' attribute has been specified on the XUL window, r=NeilDeakin.

Differential Revision: https://phabricator.services.mozilla.com/D21753

--HG--
extra : moz-landing-system : lando
parent 68820fd6
......@@ -1506,14 +1506,13 @@ void nsXULWindow::SyncAttributesToWidget() {
NS_ENSURE_TRUE_VOID(mWindow);
// "id" attribute for icon
windowElement->GetAttribute(NS_LITERAL_STRING("id"), attr);
if (attr.IsEmpty()) {
attr.AssignLiteral("default");
}
mWindow->SetIcon(attr);
// "icon" attribute
windowElement->GetAttribute(NS_LITERAL_STRING("icon"), attr);
if (!attr.IsEmpty()) {
mWindow->SetIcon(attr);
NS_ENSURE_TRUE_VOID(mWindow);
NS_ENSURE_TRUE_VOID(mWindow);
}
// "drawtitle" attribute
windowElement->GetAttribute(NS_LITERAL_STRING("drawtitle"), attr);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment