Title: [201005] branches/safari-602.1.32-branch
- Revision
- 201005
- Author
- [email protected]
- Date
- 2016-05-17 01:47:03 -0700 (Tue, 17 May 2016)
Log Message
Merge r200803. rdar://problem/17779042
Modified Paths
Added Paths
Diff
Modified: branches/safari-602.1.32-branch/LayoutTests/ChangeLog (201004 => 201005)
--- branches/safari-602.1.32-branch/LayoutTests/ChangeLog 2016-05-17 08:47:00 UTC (rev 201004)
+++ branches/safari-602.1.32-branch/LayoutTests/ChangeLog 2016-05-17 08:47:03 UTC (rev 201005)
@@ -1,5 +1,19 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200803. rdar://problem/17779042
+
+ 2016-05-12 Myles C. Maxfield <[email protected]>
+
+ REGRESSION(r200601): Crash when using local() and unicode-range in @font-face blocks
+ https://bugs.webkit.org/show_bug.cgi?id=157646
+
+ Reviewed by Geoffrey Garen.
+
+ * fast/text/isLoading-crash-failed-font-expected.txt: Added.
+ * fast/text/isLoading-crash-failed-font.html: Added.
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200674. rdar://problem/17779042
2016-05-10 Myles C. Maxfield <[email protected]>
Added: branches/safari-602.1.32-branch/LayoutTests/fast/text/isLoading-crash-failed-font-expected.txt (0 => 201005)
--- branches/safari-602.1.32-branch/LayoutTests/fast/text/isLoading-crash-failed-font-expected.txt (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/fast/text/isLoading-crash-failed-font-expected.txt 2016-05-17 08:47:03 UTC (rev 201005)
@@ -0,0 +1,2 @@
+This test passes if there is no crash.
+a
Added: branches/safari-602.1.32-branch/LayoutTests/fast/text/isLoading-crash-failed-font.html (0 => 201005)
--- branches/safari-602.1.32-branch/LayoutTests/fast/text/isLoading-crash-failed-font.html (rev 0)
+++ branches/safari-602.1.32-branch/LayoutTests/fast/text/isLoading-crash-failed-font.html 2016-05-17 08:47:03 UTC (rev 201005)
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "webfont";
+ src: local("thisisnotarealfont");
+}
+@font-face {
+ font-family: "webfont";
+ src: url("../../resources/Ahem.ttf");
+ unicode-range: U+1234;
+}
+</style>
+<script>
+if (window.testRunner)
+ window.testRunner.dumpAsText();
+</script>
+</head>
+<body>
+This test passes if there is no crash.
+<div style="font-family: webfont">a</div>
+</body>
+</html>
\ No newline at end of file
Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201004 => 201005)
--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 08:47:00 UTC (rev 201004)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 08:47:03 UTC (rev 201005)
@@ -1,5 +1,22 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200803. rdar://problem/17779042
+
+ 2016-05-12 Myles C. Maxfield <[email protected]>
+
+ REGRESSION(r200601): Crash when using local() and unicode-range in @font-face blocks
+ https://bugs.webkit.org/show_bug.cgi?id=157646
+
+ Reviewed by Geoffrey Garen.
+
+ I simply forgot a null check.
+
+ Test: fast/text/isLoading-crash-failed-font.html
+
+ * css/CSSSegmentedFontFace.cpp:
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200601. rdar://problem/17779042
2016-05-09 Myles C. Maxfield <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp (201004 => 201005)
--- branches/safari-602.1.32-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp 2016-05-17 08:47:00 UTC (rev 201004)
+++ branches/safari-602.1.32-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp 2016-05-17 08:47:03 UTC (rev 201005)
@@ -84,7 +84,7 @@
bool isLoading() const final
{
- return m_result && m_result.value()->isLoading();
+ return m_result && m_result.value() && m_result.value()->isLoading();
}
mutable Optional<RefPtr<Font>> m_result; // Caches nullptr too
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
