Title: [200803] trunk
- Revision
- 200803
- Author
- [email protected]
- Date
- 2016-05-12 17:24:03 -0700 (Thu, 12 May 2016)
Log Message
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.
Source/WebCore:
I simply forgot a null check.
Test: fast/text/isLoading-crash-failed-font.html
* css/CSSSegmentedFontFace.cpp:
LayoutTests:
* fast/text/isLoading-crash-failed-font-expected.txt: Added.
* fast/text/isLoading-crash-failed-font.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (200802 => 200803)
--- trunk/LayoutTests/ChangeLog 2016-05-13 00:09:12 UTC (rev 200802)
+++ trunk/LayoutTests/ChangeLog 2016-05-13 00:24:03 UTC (rev 200803)
@@ -1,3 +1,13 @@
+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-12 Jiewen Tan <[email protected]>
REGRESSION (r199313): ICBC app: text field In the webview is not tappable
Added: trunk/LayoutTests/fast/text/isLoading-crash-failed-font-expected.txt (0 => 200803)
--- trunk/LayoutTests/fast/text/isLoading-crash-failed-font-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/isLoading-crash-failed-font-expected.txt 2016-05-13 00:24:03 UTC (rev 200803)
@@ -0,0 +1,2 @@
+This test passes if there is no crash.
+a
Added: trunk/LayoutTests/fast/text/isLoading-crash-failed-font.html (0 => 200803)
--- trunk/LayoutTests/fast/text/isLoading-crash-failed-font.html (rev 0)
+++ trunk/LayoutTests/fast/text/isLoading-crash-failed-font.html 2016-05-13 00:24:03 UTC (rev 200803)
@@ -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: trunk/Source/WebCore/ChangeLog (200802 => 200803)
--- trunk/Source/WebCore/ChangeLog 2016-05-13 00:09:12 UTC (rev 200802)
+++ trunk/Source/WebCore/ChangeLog 2016-05-13 00:24:03 UTC (rev 200803)
@@ -1,3 +1,16 @@
+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-12 Jiewen Tan <[email protected]>
REGRESSION (r199313): ICBC app: text field In the webview is not tappable
Modified: trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp (200802 => 200803)
--- trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp 2016-05-13 00:09:12 UTC (rev 200802)
+++ trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp 2016-05-13 00:24:03 UTC (rev 200803)
@@ -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
