Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp

 /*
  * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 54 matching lines @@
     if (!m_format.isEmpty()) {
         result.appendLiteral(" format(");
         result.append(serializeString(m_format));
         result.appendLiteral(")");
     }
     return result.toString();
 }
 
 bool CSSFontFaceSrcValue::hasFailedOrCanceledSubresources() const
 {
-    return m_fetched && m_fetched->loadFailedOrCanceled();
+    return m_fetched && m_fetched->resource()->loadFailedOrCanceled();
 }
 
 static void setCrossOriginAccessControl(FetchRequest& request, SecurityOrigin* securityOrigin)
 {
     // Local fonts are accessible from file: URLs even when
     // allowFileAccessFromFileURLs is false.
     if (request.url().isLocalFile())
         return;
 
     request.setCrossOriginAccessControl(securityOrigin, CrossOriginAttributeAnonymous);
 }
 
 FontResource* CSSFontFaceSrcValue::fetch(Document* document)
 {
     if (!m_fetched) {
         FetchRequest request(ResourceRequest(document->completeURL(m_resource)), FetchInitiatorTypeNames::css);
         request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);
         SecurityOrigin* securityOrigin = document->securityOrigin();
         setCrossOriginAccessControl(request, securityOrigin);
         request.mutableResourceRequest().setHTTPReferrer(SecurityPolicy::generateReferrer(m_referrer.referrerPolicy, request.url(), m_referrer.referrer));
-        m_fetched = FontResource::fetch(request, document->fetcher());
+        RefPtrWillBeRawPtr<FontResource> resource = FontResource::fetch(request, document->fetcher());

[Nate Chapin, 2016/02/04 23:24:38]

This fixes https://code.google.com/p/chromium/issues/detail?id=583609. Users of
m_fetched expect its resource() to be non-null.

+        if (resource)
+            m_fetched = FontResourceHelper::create(resource.release());
     } else {
         // FIXME: CSSFontFaceSrcValue::fetch is invoked when @font-face rule
         // is processed by StyleResolver / StyleEngine.
         restoreCachedResourceIfNeeded(document);
     }
-    return m_fetched.get();
+    return m_fetched->resource();

[haraken, 2016/02/04 23:56:30]

With the above fix, m_fetched can be null here. Isn't it problematic?

[Nate Chapin, 2016/02/06 00:34:06]

Yep. Fixed.

 }
 
 void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(Document* document)
 {
     ASSERT(m_fetched);
     ASSERT(document && document->fetcher());
 
     const String resourceURL = document->completeURL(m_resource);
     if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL)))
         return;
 
     FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames::css);
     request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);
-    MixedContentChecker::shouldBlockFetch(document->frame(), m_fetched->lastResourceRequest(),
-        m_fetched->lastResourceRequest().url(), MixedContentChecker::SendReport);
-    document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFetcher::ResourceLoadingFromCache);
+    MixedContentChecker::shouldBlockFetch(document->frame(), m_fetched->resource()->lastResourceRequest(),
+        m_fetched->resource()->lastResourceRequest().url(), MixedContentChecker::SendReport);
+    document->fetcher()->requestLoadStarted(m_fetched->resource(), request, ResourceFetcher::ResourceLoadingFromCache);
 }
 
 bool CSSFontFaceSrcValue::equals(const CSSFontFaceSrcValue& other) const
 {
     return m_isLocal == other.m_isLocal && m_format == other.m_format && m_resource == other.m_resource;
 }
 
 } // namespace blink