Title: [259062] trunk/Source/WebCore
- Revision
- 259062
- Author
- katherine_che...@apple.com
- Date
- 2020-03-26 12:00:08 -0700 (Thu, 26 Mar 2020)
Log Message
ScopeRuleSets::initializeUserStyle() should not add console logging if there are no injected user style sheets
https://bugs.webkit.org/show_bug.cgi?id=209548
<rdar://problem/60851745>
Reviewed by Darin Adler.
Logging when there are no injected user style sheets is unnecessary and confusing.
* style/StyleScopeRuleSets.cpp:
(WebCore::Style::ScopeRuleSets::initializeUserStyle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (259061 => 259062)
--- trunk/Source/WebCore/ChangeLog 2020-03-26 18:58:42 UTC (rev 259061)
+++ trunk/Source/WebCore/ChangeLog 2020-03-26 19:00:08 UTC (rev 259062)
@@ -1,3 +1,16 @@
+2020-03-26 Kate Cheney <katherine_che...@apple.com>
+
+ ScopeRuleSets::initializeUserStyle() should not add console logging if there are no injected user style sheets
+ https://bugs.webkit.org/show_bug.cgi?id=209548
+ <rdar://problem/60851745>
+
+ Reviewed by Darin Adler.
+
+ Logging when there are no injected user style sheets is unnecessary and confusing.
+
+ * style/StyleScopeRuleSets.cpp:
+ (WebCore::Style::ScopeRuleSets::initializeUserStyle):
+
2020-03-26 Alexey Proskuryakov <a...@apple.com>
REGRESSION(r259042): It creates some test failures (Requested by youenn on #webkit).
Modified: trunk/Source/WebCore/style/StyleScopeRuleSets.cpp (259061 => 259062)
--- trunk/Source/WebCore/style/StyleScopeRuleSets.cpp 2020-03-26 18:58:42 UTC (rev 259061)
+++ trunk/Source/WebCore/style/StyleScopeRuleSets.cpp 2020-03-26 19:00:08 UTC (rev 259062)
@@ -92,7 +92,7 @@
if (CSSStyleSheet* pageUserSheet = extensionStyleSheets.pageUserSheet())
tempUserStyle->addRulesFromSheet(pageUserSheet->contents(), nullptr, mediaQueryEvaluator, m_styleResolver);
auto* page = m_styleResolver.document().page();
- if (page && page->mainFrame().loader().client().hasNavigatedAwayFromAppBoundDomain())
+ if (page && page->mainFrame().loader().client().hasNavigatedAwayFromAppBoundDomain() && !extensionStyleSheets.injectedUserStyleSheets().isEmpty())
m_styleResolver.document().addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Ignoring user style sheet for non-app bound domain."_s);
else
collectRulesFromUserStyleSheets(extensionStyleSheets.injectedUserStyleSheets(), tempUserStyle.get(), mediaQueryEvaluator);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
