Title: [282585] branches/safari-612-branch
- Revision
- 282585
- Author
- repst...@apple.com
- Date
- 2021-09-16 11:49:11 -0700 (Thu, 16 Sep 2021)
Log Message
Cherry-pick r281975. rdar://problem/83183224
The CSS Font Loading API shouldn't be able to delete a CSS-connected font
https://bugs.webkit.org/show_bug.cgi?id=229640
Reviewed by Alan Bujtas.
LayoutTests/imported/w3c:
* web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt:
Source/WebCore:
https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-delete
"1. If font is CSS-connected, return false and exit this algorithm immediately."
Tests: web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected.html
web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html
* css/FontFaceSet.cpp:
(WebCore::FontFaceSet::remove):
LayoutTests:
* TestExpectations:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281975 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Added Paths
Diff
Modified: branches/safari-612-branch/LayoutTests/ChangeLog (282584 => 282585)
--- branches/safari-612-branch/LayoutTests/ChangeLog 2021-09-16 18:49:07 UTC (rev 282584)
+++ branches/safari-612-branch/LayoutTests/ChangeLog 2021-09-16 18:49:11 UTC (rev 282585)
@@ -1,5 +1,44 @@
2021-09-16 Russell Epstein <repst...@apple.com>
+ Cherry-pick r281975. rdar://problem/83183224
+
+ The CSS Font Loading API shouldn't be able to delete a CSS-connected font
+ https://bugs.webkit.org/show_bug.cgi?id=229640
+
+ Reviewed by Alan Bujtas.
+
+ LayoutTests/imported/w3c:
+
+ * web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt:
+
+ Source/WebCore:
+
+ https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-delete
+ "1. If font is CSS-connected, return false and exit this algorithm immediately."
+
+ Tests: web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected.html
+ web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html
+
+ * css/FontFaceSet.cpp:
+ (WebCore::FontFaceSet::remove):
+
+ LayoutTests:
+
+ * TestExpectations:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281975 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-02 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ The CSS Font Loading API shouldn't be able to delete a CSS-connected font
+ https://bugs.webkit.org/show_bug.cgi?id=229640
+
+ Reviewed by Alan Bujtas.
+
+ * TestExpectations:
+
+2021-09-16 Russell Epstein <repst...@apple.com>
+
Cherry-pick r281951. rdar://problem/83183268
FontFaceSet.add() needs to throw when called on a CSS-connected font
Modified: branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog (282584 => 282585)
--- branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog 2021-09-16 18:49:07 UTC (rev 282584)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/ChangeLog 2021-09-16 18:49:11 UTC (rev 282585)
@@ -1,5 +1,44 @@
2021-09-16 Russell Epstein <repst...@apple.com>
+ Cherry-pick r281975. rdar://problem/83183224
+
+ The CSS Font Loading API shouldn't be able to delete a CSS-connected font
+ https://bugs.webkit.org/show_bug.cgi?id=229640
+
+ Reviewed by Alan Bujtas.
+
+ LayoutTests/imported/w3c:
+
+ * web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt:
+
+ Source/WebCore:
+
+ https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-delete
+ "1. If font is CSS-connected, return false and exit this algorithm immediately."
+
+ Tests: web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected.html
+ web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html
+
+ * css/FontFaceSet.cpp:
+ (WebCore::FontFaceSet::remove):
+
+ LayoutTests:
+
+ * TestExpectations:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281975 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-02 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ The CSS Font Loading API shouldn't be able to delete a CSS-connected font
+ https://bugs.webkit.org/show_bug.cgi?id=229640
+
+ Reviewed by Alan Bujtas.
+
+ * web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt:
+
+2021-09-16 Russell Epstein <repst...@apple.com>
+
Cherry-pick r281951. rdar://problem/83183268
FontFaceSet.add() needs to throw when called on a CSS-connected font
Added: branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt (0 => 282585)
--- branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt (rev 0)
+++ branches/safari-612-branch/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt 2021-09-16 18:49:11 UTC (rev 282585)
@@ -0,0 +1,3 @@
+
+PASS fontfaceset-delete-css-connected
+
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (282584 => 282585)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2021-09-16 18:49:07 UTC (rev 282584)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-09-16 18:49:11 UTC (rev 282585)
@@ -1,5 +1,51 @@
2021-09-16 Russell Epstein <repst...@apple.com>
+ Cherry-pick r281975. rdar://problem/83183224
+
+ The CSS Font Loading API shouldn't be able to delete a CSS-connected font
+ https://bugs.webkit.org/show_bug.cgi?id=229640
+
+ Reviewed by Alan Bujtas.
+
+ LayoutTests/imported/w3c:
+
+ * web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt:
+
+ Source/WebCore:
+
+ https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-delete
+ "1. If font is CSS-connected, return false and exit this algorithm immediately."
+
+ Tests: web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected.html
+ web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html
+
+ * css/FontFaceSet.cpp:
+ (WebCore::FontFaceSet::remove):
+
+ LayoutTests:
+
+ * TestExpectations:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281975 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-09-02 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ The CSS Font Loading API shouldn't be able to delete a CSS-connected font
+ https://bugs.webkit.org/show_bug.cgi?id=229640
+
+ Reviewed by Alan Bujtas.
+
+ https://drafts.csswg.org/css-font-loading-3/#dom-fontfaceset-delete
+ "1. If font is CSS-connected, return false and exit this algorithm immediately."
+
+ Tests: web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected.html
+ web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html
+
+ * css/FontFaceSet.cpp:
+ (WebCore::FontFaceSet::remove):
+
+2021-09-16 Russell Epstein <repst...@apple.com>
+
Cherry-pick r281951. rdar://problem/83183268
FontFaceSet.add() needs to throw when called on a CSS-connected font
Modified: branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp (282584 => 282585)
--- branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp 2021-09-16 18:49:07 UTC (rev 282584)
+++ branches/safari-612-branch/Source/WebCore/css/FontFaceSet.cpp 2021-09-16 18:49:11 UTC (rev 282585)
@@ -131,6 +131,8 @@
bool FontFaceSet::remove(FontFace& face)
{
+ if (face.backing().cssConnection())
+ return false;
bool result = m_backing->hasFace(face.backing());
if (result)
m_backing->remove(face.backing());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
