Title: [281975] trunk
- Revision
- 281975
- Author
- [email protected]
- Date
- 2021-09-02 20:14:51 -0700 (Thu, 02 Sep 2021)
Log Message
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:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (281974 => 281975)
--- trunk/LayoutTests/ChangeLog 2021-09-03 02:53:23 UTC (rev 281974)
+++ trunk/LayoutTests/ChangeLog 2021-09-03 03:14:51 UTC (rev 281975)
@@ -1,3 +1,12 @@
+2021-09-02 Myles C. Maxfield <[email protected]>
+
+ 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-02 Marcos Caceres <[email protected]>
Web Share tests are out of date
Modified: trunk/LayoutTests/TestExpectations (281974 => 281975)
--- trunk/LayoutTests/TestExpectations 2021-09-03 02:53:23 UTC (rev 281974)
+++ trunk/LayoutTests/TestExpectations 2021-09-03 03:14:51 UTC (rev 281975)
@@ -5129,5 +5129,4 @@
webkit.org/b/229726 imported/w3c/web-platform-tests/css/css-font-loading/fontface-override-descriptors.html [ ImageOnlyFailure ]
webkit.org/b/229726 imported/w3c/web-platform-tests/css/css-font-loading/fontface-size-adjust-descriptor.html [ ImageOnlyFailure ]
-webkit.org/b/229640 imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-2.html [ ImageOnlyFailure ]
webkit.org/b/229727 imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-load-var.html [ Skip ]
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (281974 => 281975)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-09-03 02:53:23 UTC (rev 281974)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-09-03 03:14:51 UTC (rev 281975)
@@ -1,3 +1,12 @@
+2021-09-02 Myles C. Maxfield <[email protected]>
+
+ 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-02 Marcos Caceres <[email protected]>
Web Share tests are out of date
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt (281974 => 281975)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt 2021-09-03 02:53:23 UTC (rev 281974)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-font-loading/fontfaceset-delete-css-connected-expected.txt 2021-09-03 03:14:51 UTC (rev 281975)
@@ -1,3 +1,3 @@
-FAIL fontfaceset-delete-css-connected assert_equals: expected 1 but got 0
+PASS fontfaceset-delete-css-connected
Modified: trunk/Source/WebCore/ChangeLog (281974 => 281975)
--- trunk/Source/WebCore/ChangeLog 2021-09-03 02:53:23 UTC (rev 281974)
+++ trunk/Source/WebCore/ChangeLog 2021-09-03 03:14:51 UTC (rev 281975)
@@ -1,3 +1,19 @@
+2021-09-02 Myles C. Maxfield <[email protected]>
+
+ 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-02 Alan Bujtas <[email protected]>
Relative -webkit-scrollbar width value may lead to unstable layout
Modified: trunk/Source/WebCore/css/FontFaceSet.cpp (281974 => 281975)
--- trunk/Source/WebCore/css/FontFaceSet.cpp 2021-09-03 02:53:23 UTC (rev 281974)
+++ trunk/Source/WebCore/css/FontFaceSet.cpp 2021-09-03 03:14:51 UTC (rev 281975)
@@ -129,6 +129,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
