Changeset 197570 in webkit for trunk/Source/WebCore/css/CSSFontFaceSource.cpp

Timestamp:

Mar 4, 2016, 10:30:52 AM (9 years ago)

Author:

[email protected]

Message:

[iOS] Crash during font loading when injected bundle cancels load
​https://bugs.webkit.org/show_bug.cgi?id=155001

Reviewed by Tim Horton.

Source/WebCore:

If a injected bundle cancels the load, the fontLoaded() callback will be
called twice. We can simply detect this condition.

Test: CancelLoading.CancelFontSubresource API test

• css/CSSFontFaceSource.cpp:

(WebCore::CSSFontFaceSource::fontLoaded):

Tools:

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKit2/Ahem.ttf: Added.
• TestWebKitAPI/Tests/WebKit2/webfont.html: Added.
• TestWebKitAPI/Tests/WebKit2Cocoa/CancelFontSubresource.mm: Added.

(-[Myles webView:didFinishNavigation:]):
(TEST):

• TestWebKitAPI/Tests/WebKit2Cocoa/CancelFontSubresourcePlugIn.mm: Added.

(-[CancelFontSubresourcePlugIn webProcessPlugIn:didCreateBrowserContextController:]):
(-[CancelFontSubresourcePlugIn webProcessPlugInBrowserContextController:frame:willSendRequestForResource:request:redirectResponse:]):

File:

• trunk/Source/WebCore/css/CSSFontFaceSource.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSFontFaceSource.cpp

@@ -111 +111 @@
     if (m_status == Status::Pending)
         setStatus(Status::Loading);
+    else if (m_status == Status::Failure) {
+        // This function may be called twice if loading was cancelled.
+        ASSERT(m_font->errorOccurred());
+        return;
+    }
 
     if (m_font->errorOccurred())