corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1281135 - Make <link disabled> work and HTMLLinkElement.disabled reflect that attribute. r=bzbarsky

Browse Source 
...instead of forwarding to the sheet like HTMLStyleElement does.

I've proposed this behavior in:

  https://github.com/whatwg/html/issues/3840#issuecomment-480894419

I think this is one of the sane behaviors we can have, what Blink / WebKit do
makes no sense to me.

Alternative potentially-sane behavior is making the initial value of the
stylesheet's disabled bit the same as the content attribute, and both reflect
and forward the attribute from the setter.

That means that setAttribute does something different than setting `disabled`,
which means that you can get into all sorts of funny states when reloading the
sheet... So I rather not do that.

Differential Revision: https://phabricator.services.mozilla.com/D26573
This commit is contained in:
Emilio Cobos Álvarez
2019-04-19 13:31:05 +00:00
parent 64ea91b1bd
commit 54c2741ad0
24 changed files with 361 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dom/html/HTMLLinkElement.cpp
View File

@@ -85,12 +85,18 @@ NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(HTMLLinkElement,
NS_IMPL_ELEMENT_CLONE(HTMLLinkElement)
bool HTMLLinkElement::Disabled() {
bool HTMLLinkElement::Disabled() const {
if (StaticPrefs::dom_link_disabled_attribute_enabled()) {
return GetBoolAttr(nsGkAtoms::disabled);
}
StyleSheet* ss = GetSheet();
return ss && ss->Disabled();
}
void HTMLLinkElement::SetDisabled(bool aDisabled) {
void HTMLLinkElement::SetDisabled(bool aDisabled, ErrorResult& aRv) {
if (StaticPrefs::dom_link_disabled_attribute_enabled()) {
return SetHTMLBoolAttr(nsGkAtoms::disabled, aDisabled, aRv);
}
if (StyleSheet* ss = GetSheet()) {
ss->SetDisabled(aDisabled);
}
@@ -314,7 +320,9 @@ nsresult HTMLLinkElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
(aName == nsGkAtoms::href || aName == nsGkAtoms::rel ||
aName == nsGkAtoms::title || aName == nsGkAtoms::media ||
aName == nsGkAtoms::type || aName == nsGkAtoms::as ||
aName == nsGkAtoms::crossorigin)) {
aName == nsGkAtoms::crossorigin ||
(aName == nsGkAtoms::disabled &&
StaticPrefs::dom_link_disabled_attribute_enabled()))) {
bool dropSheet = false;
if (aName == nsGkAtoms::rel) {
nsAutoString value;
@@ -338,18 +346,25 @@ nsresult HTMLLinkElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
const bool forceUpdate = dropSheet || aName == nsGkAtoms::title ||
aName == nsGkAtoms::media ||
aName == nsGkAtoms::type;
aName == nsGkAtoms::type ||
aName == nsGkAtoms::disabled;
Unused << UpdateStyleSheetInternal(
nullptr, nullptr, forceUpdate ? ForceUpdate::Yes : ForceUpdate::No);
}
} else {
// Since removing href or rel makes us no longer link to a
// stylesheet, force updates for those too.
if (aNameSpaceID == kNameSpaceID_None) {
if (aName == nsGkAtoms::disabled &&
StaticPrefs::dom_link_disabled_attribute_enabled()) {
mExplicitlyEnabled = true;
}
// Since removing href or rel makes us no longer link to a stylesheet,
// force updates for those too.
if (aName == nsGkAtoms::href || aName == nsGkAtoms::rel ||
aName == nsGkAtoms::title || aName == nsGkAtoms::media ||
aName == nsGkAtoms::type) {
aName == nsGkAtoms::type ||
(aName == nsGkAtoms::disabled &&
StaticPrefs::dom_link_disabled_attribute_enabled())) {
Unused << UpdateStyleSheetInternal(nullptr, nullptr, ForceUpdate::Yes);
}
if ((aName == nsGkAtoms::as || aName == nsGkAtoms::type ||
@@ -415,6 +430,10 @@ Maybe<nsStyleLinkElement::SheetInfo> HTMLLinkElement::GetStyleSheetInfo() {
return Nothing();
}
if (StaticPrefs::dom_link_disabled_attribute_enabled() && Disabled()) {
return Nothing();
}
nsAutoString title;
nsAutoString media;
GetTitleAndMediaForElement(*this, title, media);
@@ -444,6 +463,7 @@ Maybe<nsStyleLinkElement::SheetInfo> HTMLLinkElement::GetStyleSheetInfo() {
media,
alternate ? HasAlternateRel::Yes : HasAlternateRel::No,
IsInline::No,
mExplicitlyEnabled ? IsExplicitlyEnabled::Yes : IsExplicitlyEnabled::No,
});
}