Title: [293198] branches/safari-613-branch/Source/WebCore
- Revision
- 293198
- Author
- [email protected]
- Date
- 2022-04-21 17:02:01 -0700 (Thu, 21 Apr 2022)
Log Message
Cherry-pick r292095. rdar://problem/90240658
Ensure m_layerRulesBeforeImportRules is properly copied during StyleSheetContents instantiation
https://bugs.webkit.org/show_bug.cgi?id=238537
Reviewed by Antti Koivisto.
During the instantiation of the StyleSheetContents the m_layerRulesBeforeImportRules was not being
properly copied.
* css/StyleSheetContents.cpp:
(WebCore::StyleSheetContents::StyleSheetContents):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292095 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebCore/ChangeLog (293197 => 293198)
--- branches/safari-613-branch/Source/WebCore/ChangeLog 2022-04-22 00:01:22 UTC (rev 293197)
+++ branches/safari-613-branch/Source/WebCore/ChangeLog 2022-04-22 00:02:01 UTC (rev 293198)
@@ -1,3 +1,33 @@
+2022-04-21 Alan Coon <[email protected]>
+
+ Cherry-pick r292095. rdar://problem/90240658
+
+ Ensure m_layerRulesBeforeImportRules is properly copied during StyleSheetContents instantiation
+ https://bugs.webkit.org/show_bug.cgi?id=238537
+
+ Reviewed by Antti Koivisto.
+
+ During the instantiation of the StyleSheetContents the m_layerRulesBeforeImportRules was not being
+ properly copied.
+
+ * css/StyleSheetContents.cpp:
+ (WebCore::StyleSheetContents::StyleSheetContents):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292095 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-03-29 Brandon Stewart <[email protected]>
+
+ Ensure m_layerRulesBeforeImportRules is properly copied during StyleSheetContents instantiation
+ https://bugs.webkit.org/show_bug.cgi?id=238537
+
+ Reviewed by Antti Koivisto.
+
+ During the instantiation of the StyleSheetContents the m_layerRulesBeforeImportRules was not being
+ properly copied.
+
+ * css/StyleSheetContents.cpp:
+ (WebCore::StyleSheetContents::StyleSheetContents):
+
2022-04-20 Alan Coon <[email protected]>
Cherry-pick r289100. rdar://problem/79950080
Modified: branches/safari-613-branch/Source/WebCore/css/StyleSheetContents.cpp (293197 => 293198)
--- branches/safari-613-branch/Source/WebCore/css/StyleSheetContents.cpp 2022-04-22 00:01:22 UTC (rev 293197)
+++ branches/safari-613-branch/Source/WebCore/css/StyleSheetContents.cpp 2022-04-22 00:02:01 UTC (rev 293198)
@@ -81,6 +81,7 @@
, m_ownerRule(nullptr)
, m_originalURL(o.m_originalURL)
, m_encodingFromCharsetRule(o.m_encodingFromCharsetRule)
+ , m_layerRulesBeforeImportRules(o.m_layerRulesBeforeImportRules.size())
, m_importRules(o.m_importRules.size())
, m_namespaceRules(o.m_namespaceRules.size())
, m_childRules(o.m_childRules.size())
@@ -97,7 +98,10 @@
// FIXME: Copy import rules.
ASSERT(o.m_importRules.isEmpty());
- for (unsigned i = 0; i < m_childRules.size(); ++i)
+ for (size_t i = 0; i < m_layerRulesBeforeImportRules.size(); ++i)
+ m_layerRulesBeforeImportRules[i] = o.m_layerRulesBeforeImportRules[i]->copy();
+
+ for (size_t i = 0; i < m_childRules.size(); ++i)
m_childRules[i] = o.m_childRules[i]->copy();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
