Title: [287620] branches/safari-612-branch
- Revision
- 287620
- Author
- repst...@apple.com
- Date
- 2022-01-05 10:20:40 -0800 (Wed, 05 Jan 2022)
Log Message
Cherry-pick r285710. rdar://problem/87125070
REGRESSION(r285624) Using revert keyword with a css variable hits assert
https://bugs.webkit.org/show_bug.cgi?id=233031
rdar://85332271
Reviewed by Tim Horton.
Source/WebCore:
Test: fast/selectors/variable-revert-crash.html
* style/StyleBuilderState.h:
Default initialization set the variable to a value that is not in the enumeration.
LayoutTests:
* fast/selectors/variable-revert-crash-expected.txt: Added.
* fast/selectors/variable-revert-crash.html: Added.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Added Paths
Diff
Modified: branches/safari-612-branch/LayoutTests/ChangeLog (287619 => 287620)
--- branches/safari-612-branch/LayoutTests/ChangeLog 2022-01-05 18:20:36 UTC (rev 287619)
+++ branches/safari-612-branch/LayoutTests/ChangeLog 2022-01-05 18:20:40 UTC (rev 287620)
@@ -1,3 +1,40 @@
+2022-01-05 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r285710. rdar://problem/87125070
+
+ REGRESSION(r285624) Using revert keyword with a css variable hits assert
+ https://bugs.webkit.org/show_bug.cgi?id=233031
+ rdar://85332271
+
+ Reviewed by Tim Horton.
+
+ Source/WebCore:
+
+ Test: fast/selectors/variable-revert-crash.html
+
+ * style/StyleBuilderState.h:
+
+ Default initialization set the variable to a value that is not in the enumeration.
+
+ LayoutTests:
+
+ * fast/selectors/variable-revert-crash-expected.txt: Added.
+ * fast/selectors/variable-revert-crash.html: Added.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-12 Antti Koivisto <an...@apple.com>
+
+ REGRESSION(r285624) Using revert keyword with a css variable hits assert
+ https://bugs.webkit.org/show_bug.cgi?id=233031
+ rdar://85332271
+
+ Reviewed by Tim Horton.
+
+ * fast/selectors/variable-revert-crash-expected.txt: Added.
+ * fast/selectors/variable-revert-crash.html: Added.
+
2021-12-22 Alan Coon <alanc...@apple.com>
Cherry-pick r287366. rdar://problem/84379650
Added: branches/safari-612-branch/LayoutTests/fast/selectors/variable-revert-crash-expected.txt (0 => 287620)
--- branches/safari-612-branch/LayoutTests/fast/selectors/variable-revert-crash-expected.txt (rev 0)
+++ branches/safari-612-branch/LayoutTests/fast/selectors/variable-revert-crash-expected.txt 2022-01-05 18:20:40 UTC (rev 287620)
@@ -0,0 +1 @@
+This test passes if it doesn't crash.
Added: branches/safari-612-branch/LayoutTests/fast/selectors/variable-revert-crash.html (0 => 287620)
--- branches/safari-612-branch/LayoutTests/fast/selectors/variable-revert-crash.html (rev 0)
+++ branches/safari-612-branch/LayoutTests/fast/selectors/variable-revert-crash.html 2022-01-05 18:20:40 UTC (rev 287620)
@@ -0,0 +1,6 @@
+<audio style="--a: revert"></audio>
+This test passes if it doesn't crash.
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (287619 => 287620)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2022-01-05 18:20:36 UTC (rev 287619)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2022-01-05 18:20:40 UTC (rev 287620)
@@ -1,5 +1,45 @@
2022-01-05 Russell Epstein <repst...@apple.com>
+ Cherry-pick r285710. rdar://problem/87125070
+
+ REGRESSION(r285624) Using revert keyword with a css variable hits assert
+ https://bugs.webkit.org/show_bug.cgi?id=233031
+ rdar://85332271
+
+ Reviewed by Tim Horton.
+
+ Source/WebCore:
+
+ Test: fast/selectors/variable-revert-crash.html
+
+ * style/StyleBuilderState.h:
+
+ Default initialization set the variable to a value that is not in the enumeration.
+
+ LayoutTests:
+
+ * fast/selectors/variable-revert-crash-expected.txt: Added.
+ * fast/selectors/variable-revert-crash.html: Added.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@285710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-11-12 Antti Koivisto <an...@apple.com>
+
+ REGRESSION(r285624) Using revert keyword with a css variable hits assert
+ https://bugs.webkit.org/show_bug.cgi?id=233031
+ rdar://85332271
+
+ Reviewed by Tim Horton.
+
+ Test: fast/selectors/variable-revert-crash.html
+
+ * style/StyleBuilderState.h:
+
+ Default initialization set the variable to a value that is not in the enumeration.
+
+2022-01-05 Russell Epstein <repst...@apple.com>
+
Cherry-pick r284980. rdar://problem/84223894
Fix CARingBuffer mix mode
Modified: branches/safari-612-branch/Source/WebCore/style/StyleBuilderState.h (287619 => 287620)
--- branches/safari-612-branch/Source/WebCore/style/StyleBuilderState.h 2022-01-05 18:20:36 UTC (rev 287619)
+++ branches/safari-612-branch/Source/WebCore/style/StyleBuilderState.h 2022-01-05 18:20:40 UTC (rev 287620)
@@ -129,7 +129,7 @@
Bitmap<numCSSProperties> m_inProgressProperties;
HashSet<String> m_inProgressPropertiesCustom;
- CascadeLevel m_cascadeLevel { };
+ CascadeLevel m_cascadeLevel { CascadeLevel::Author };
ScopeOrdinal m_styleScopeOrdinal { };
SelectorChecker::LinkMatchMask m_linkMatch { };
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
