Title: [238292] branches/safari-606-branch
- Revision
- 238292
- Author
- alanc...@apple.com
- Date
- 2018-11-16 11:19:53 -0800 (Fri, 16 Nov 2018)
Log Message
Cherry-pick r238222. rdar://problem/45997333
Remove fonts from CSSFontFaceSet safely
https://bugs.webkit.org/show_bug.cgi?id=191676
Reviewed by Zalan Bujtas.
Source/WebCore:
Test: fast/text/font-face-set-remove-safely.html
* css/CSSFontFaceSet.cpp:
(WebCore::CSSFontFaceSet::remove):
LayoutTests:
* fast/text/font-face-set-remove-safely-expected.txt: Added.
* fast/text/font-face-set-remove-safely.html: Added.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238222 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Added Paths
Diff
Modified: branches/safari-606-branch/LayoutTests/ChangeLog (238291 => 238292)
--- branches/safari-606-branch/LayoutTests/ChangeLog 2018-11-16 19:06:35 UTC (rev 238291)
+++ branches/safari-606-branch/LayoutTests/ChangeLog 2018-11-16 19:19:53 UTC (rev 238292)
@@ -1,3 +1,38 @@
+2018-11-16 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r238222. rdar://problem/45997333
+
+ Remove fonts from CSSFontFaceSet safely
+ https://bugs.webkit.org/show_bug.cgi?id=191676
+
+ Reviewed by Zalan Bujtas.
+
+ Source/WebCore:
+
+ Test: fast/text/font-face-set-remove-safely.html
+
+ * css/CSSFontFaceSet.cpp:
+ (WebCore::CSSFontFaceSet::remove):
+
+ LayoutTests:
+
+ * fast/text/font-face-set-remove-safely-expected.txt: Added.
+ * fast/text/font-face-set-remove-safely.html: Added.
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238222 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-15 Antti Koivisto <an...@apple.com>
+
+ Remove fonts from CSSFontFaceSet safely
+ https://bugs.webkit.org/show_bug.cgi?id=191676
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/text/font-face-set-remove-safely-expected.txt: Added.
+ * fast/text/font-face-set-remove-safely.html: Added.
+
2018-11-16 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r238119. rdar://problem/45997459
Added: branches/safari-606-branch/LayoutTests/fast/text/font-face-set-remove-safely-expected.txt (0 => 238292)
--- branches/safari-606-branch/LayoutTests/fast/text/font-face-set-remove-safely-expected.txt (rev 0)
+++ branches/safari-606-branch/LayoutTests/fast/text/font-face-set-remove-safely-expected.txt 2018-11-16 19:19:53 UTC (rev 238292)
@@ -0,0 +1,4 @@
+CONSOLE MESSAGE: line 6: Retrieving fonts...
+CONSOLE MESSAGE: line 8: Clearing...
+CONSOLE MESSAGE: line 10: Done.
+
Added: branches/safari-606-branch/LayoutTests/fast/text/font-face-set-remove-safely.html (0 => 238292)
--- branches/safari-606-branch/LayoutTests/fast/text/font-face-set-remove-safely.html (rev 0)
+++ branches/safari-606-branch/LayoutTests/fast/text/font-face-set-remove-safely.html 2018-11-16 19:19:53 UTC (rev 238292)
@@ -0,0 +1,20 @@
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function test() {
+ console.log("Retrieving fonts...");
+ var fonts = document.fonts;
+ console.log("Clearing...");
+ fonts.clear();
+ console.log("Done.");
+}
+
+</script>
+<body _onload_=test()>
+
+<svg>
+
+<font>
+
+<font-face font-family="Palatino, Menlo, Verdana, serif, monospace">
Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (238291 => 238292)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-11-16 19:06:35 UTC (rev 238291)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-11-16 19:19:53 UTC (rev 238292)
@@ -1,3 +1,40 @@
+2018-11-16 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r238222. rdar://problem/45997333
+
+ Remove fonts from CSSFontFaceSet safely
+ https://bugs.webkit.org/show_bug.cgi?id=191676
+
+ Reviewed by Zalan Bujtas.
+
+ Source/WebCore:
+
+ Test: fast/text/font-face-set-remove-safely.html
+
+ * css/CSSFontFaceSet.cpp:
+ (WebCore::CSSFontFaceSet::remove):
+
+ LayoutTests:
+
+ * fast/text/font-face-set-remove-safely-expected.txt: Added.
+ * fast/text/font-face-set-remove-safely.html: Added.
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238222 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-11-15 Antti Koivisto <an...@apple.com>
+
+ Remove fonts from CSSFontFaceSet safely
+ https://bugs.webkit.org/show_bug.cgi?id=191676
+
+ Reviewed by Zalan Bujtas.
+
+ Test: fast/text/font-face-set-remove-safely.html
+
+ * css/CSSFontFaceSet.cpp:
+ (WebCore::CSSFontFaceSet::remove):
+
2018-11-16 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r238119. rdar://problem/45997459
Modified: branches/safari-606-branch/Source/WebCore/css/CSSFontFaceSet.cpp (238291 => 238292)
--- branches/safari-606-branch/Source/WebCore/css/CSSFontFaceSet.cpp 2018-11-16 19:06:35 UTC (rev 238291)
+++ branches/safari-606-branch/Source/WebCore/css/CSSFontFaceSet.cpp 2018-11-16 19:19:53 UTC (rev 238292)
@@ -230,6 +230,8 @@
void CSSFontFaceSet::remove(const CSSFontFace& face)
{
+ auto protect = makeRef(face);
+
m_cache.clear();
for (auto* client : m_clients)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
