From 3350af82c2de5fd4cab68a566d250e38ea7fd9ad Mon Sep 17 00:00:00 2001 From: FranklinDM Date: Fri, 3 Mar 2023 21:33:13 +0800 Subject: [PATCH] Issue #2135 - Bug 1438129: Remove ShadowRoot.applyAuthorStyles. --- dom/base/ShadowRoot.cpp | 19 ------------------- dom/base/ShadowRoot.h | 2 -- .../webcomponents/test_shadowroot_style.html | 11 ++--------- dom/webidl/ShadowRoot.webidl | 1 - 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/dom/base/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp index d4b63004ae..39859da4cf 100644 --- a/dom/base/ShadowRoot.cpp +++ b/dom/base/ShadowRoot.cpp @@ -488,25 +488,6 @@ ShadowRoot::Host() return host->AsElement(); } -bool -ShadowRoot::ApplyAuthorStyles() -{ - return mProtoBinding->InheritsStyle(); -} - -void -ShadowRoot::SetApplyAuthorStyles(bool aApplyAuthorStyles) -{ - mProtoBinding->SetInheritsStyle(aApplyAuthorStyles); - - nsIPresShell* shell = OwnerDoc()->GetShell(); - if (shell) { - OwnerDoc()->BeginUpdate(UPDATE_STYLE); - shell->RecordShadowStyleChange(this); - OwnerDoc()->EndUpdate(UPDATE_STYLE); - } -} - void ShadowRoot::AttributeChanged(nsIDocument* aDocument, Element* aElement, diff --git a/dom/base/ShadowRoot.h b/dom/base/ShadowRoot.h index 63535c9a06..580099875d 100644 --- a/dom/base/ShadowRoot.h +++ b/dom/base/ShadowRoot.h @@ -59,8 +59,6 @@ public: // [deprecated] Shadow DOM v0 void InsertSheet(StyleSheet* aSheet, nsIContent* aLinkingContent); void RemoveSheet(StyleSheet* aSheet); - bool ApplyAuthorStyles(); - void SetApplyAuthorStyles(bool aApplyAuthorStyles); StyleSheetList* StyleSheets() { return &DocumentOrShadowRoot::EnsureDOMStyleSheets(); diff --git a/dom/tests/mochitest/webcomponents/test_shadowroot_style.html b/dom/tests/mochitest/webcomponents/test_shadowroot_style.html index f310ff97c4..2f51b1ba9c 100644 --- a/dom/tests/mochitest/webcomponents/test_shadowroot_style.html +++ b/dom/tests/mochitest/webcomponents/test_shadowroot_style.html @@ -48,19 +48,12 @@ isnot(getComputedStyle(document.getElementById("bodydiv"), null).getPropertyValu // Make sure that elements in the ShadowRoot are styled according to the ShadowRoot style. is(getComputedStyle(divToStyle, null).getPropertyValue("height"), "100px", "ShadowRoot style sheets should apply to elements in ShadowRoot."); -// Tests for applyAuthorStyles. +// Tests for author styles not applying in a ShadowRoot. var authorStyle = document.createElement("style"); authorStyle.innerHTML = ".fat { padding-right: 20px; padding-left: 30px; }"; document.body.appendChild(authorStyle); -is(root.applyAuthorStyles, false, "applyAuthorStyles defaults to false."); -isnot(getComputedStyle(divToStyle, null).getPropertyValue("padding-right"), "20px", "Author styles should not apply to ShadowRoot when ShadowRoot.applyAuthorStyles is false."); -root.applyAuthorStyles = true; -is(root.applyAuthorStyles, true, "applyAuthorStyles was set to true."); -is(getComputedStyle(divToStyle, null).getPropertyValue("padding-right"), "20px", "Author styles should apply to ShadowRoot when ShadowRoot.applyAuthorStyles is true."); -root.applyAuthorStyles = false; -is(root.applyAuthorStyles, false, "applyAuthorStyles was set to false."); -isnot(getComputedStyle(divToStyle, null).getPropertyValue("padding-right"), "20px", "Author styles should not apply to ShadowRoot when ShadowRoot.applyAuthorStyles is false."); +isnot(iframeWin.getComputedStyle(divToStyle, null).getPropertyValue("padding-right"), "20px", "Author styles should not apply to ShadowRoot."); // Test dynamic changes to style in ShadowRoot. root.innerHTML = '
'; diff --git a/dom/webidl/ShadowRoot.webidl b/dom/webidl/ShadowRoot.webidl index 83acd4161d..388f8e1501 100644 --- a/dom/webidl/ShadowRoot.webidl +++ b/dom/webidl/ShadowRoot.webidl @@ -31,6 +31,5 @@ interface ShadowRoot : DocumentFragment HTMLCollection getElementsByClassName(DOMString classNames); [CEReactions, SetterThrows, TreatNullAs=EmptyString] attribute DOMString innerHTML; - attribute boolean applyAuthorStyles; };