diff options
| author | athenian200 <athenian200@outlook.com> | 2020-08-11 05:27:40 -0500 |
|---|---|---|
| committer | athenian200 <athenian200@outlook.com> | 2020-08-13 01:09:58 -0500 |
| commit | 68623263573f5a087ad878f1609de272cc617399 (patch) | |
| tree | e736e47a0d896d784749c2d940d838579dad623e /dom/svg | |
| parent | a9f337ea7ca1e8743c3f38645c525751a479a561 (diff) | |
| download | UXP-68623263573f5a087ad878f1609de272cc617399.tar UXP-68623263573f5a087ad878f1609de272cc617399.tar.gz UXP-68623263573f5a087ad878f1609de272cc617399.tar.lz UXP-68623263573f5a087ad878f1609de272cc617399.tar.xz UXP-68623263573f5a087ad878f1609de272cc617399.zip | |
Issue #1629 - Part 2: Implement the Explicitly Enabled flag.
This part of the bug was significantly complicated by the following major refactors:
https://bugzilla.mozilla.org/show_bug.cgi?id=1456435
https://bugzilla.mozilla.org/show_bug.cgi?id=1459498
As best as I can tell, we just need to implement the explicitly enabled
flag on every instance of GetStyleSheetInfo, make sure
aIsExplicitlyEnabled is false in every situation except the one where
the disabled content attribute is removed from a link element, and
enable alternate stylesheets if this flag is set on them. So we take the
explicitly enabled flag as an input to PrepareSheet, and also add it to
LoadStyleLink and LoadInlineStyle. I also decided not to defer loading of
alternate stylesheets that have been explicitly enabled.
Diffstat (limited to 'dom/svg')
| -rw-r--r-- | dom/svg/SVGStyleElement.cpp | 4 | ||||
| -rw-r--r-- | dom/svg/SVGStyleElement.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/dom/svg/SVGStyleElement.cpp b/dom/svg/SVGStyleElement.cpp index 22fb204df..7655c1198 100644 --- a/dom/svg/SVGStyleElement.cpp +++ b/dom/svg/SVGStyleElement.cpp @@ -271,9 +271,11 @@ SVGStyleElement::GetStyleSheetInfo(nsAString& aTitle, nsAString& aType, nsAString& aMedia, bool* aIsScoped, - bool* aIsAlternate) + bool* aIsAlternate, + bool* aIsExplicitlyEnabled) { *aIsAlternate = false; + *aIsExplicitlyEnabled = false; nsAutoString title; GetAttr(kNameSpaceID_None, nsGkAtoms::title, title); diff --git a/dom/svg/SVGStyleElement.h b/dom/svg/SVGStyleElement.h index 9b126e7e8..e637dfb18 100644 --- a/dom/svg/SVGStyleElement.h +++ b/dom/svg/SVGStyleElement.h @@ -95,7 +95,8 @@ protected: nsAString& aType, nsAString& aMedia, bool* aIsScoped, - bool* aIsAlternate) override; + bool* aIsAlternate, + bool* aIsExplicitlyEnabled) override; virtual CORSMode GetCORSMode() const override; /** |