Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/loader/DocumentLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google 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.
@@ skipping 105 matching lines @@
 {
     ASSERT(!m_frame || !isLoading());
     ASSERT(!m_mainResource);
     ASSERT(!m_applicationCacheHost);
 }
 
 DEFINE_TRACE(DocumentLoader)
 {
     visitor->trace(m_frame);
     visitor->trace(m_fetcher);
-    // TODO(sof): start tracing ResourcePtr<>s (and m_mainResource.)
+    visitor->trace(m_mainResource);
     visitor->trace(m_writer);
     visitor->trace(m_documentLoadTiming);
     visitor->trace(m_applicationCacheHost);
     visitor->trace(m_contentSecurityPolicy);
 }
 
 unsigned long DocumentLoader::mainResourceIdentifier() const
 {
     return m_mainResource ? m_mainResource->identifier() : 0;
 }
@@ skipping 13 matching lines @@
 const ResourceRequest& DocumentLoader::request() const
 {
     return m_request;
 }
 
 const KURL& DocumentLoader::url() const
 {
     return m_request.url();
 }
 
-ResourcePtr<Resource> DocumentLoader::startPreload(Resource::Type type, FetchRequest& request)
+Resource* DocumentLoader::startPreload(Resource::Type type, FetchRequest& request)
 {
-    ResourcePtr<Resource> resource;
+    RefPtrWillBeRawPtr<Resource> resource = nullptr;
     switch (type) {
     case Resource::Image:
         resource = ImageResource::fetch(request, fetcher());
         break;
     case Resource::Script:
         resource = ScriptResource::fetch(request, fetcher());
         break;
     case Resource::CSSStyleSheet:
         resource = CSSStyleSheetResource::fetch(request, fetcher());
         break;
@@ skipping 13 matching lines @@
         break;
     case Resource::LinkPreload:
         resource = RawResource::fetch(request, fetcher());
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 
     if (resource)
         fetcher()->preloadStarted(resource.get());
-    return resource;
+    return resource.get();
 }
 
 void DocumentLoader::didChangePerformanceTiming()
 {
     if (frame() && frame()->isMainFrame() && m_state >= Committed) {
         frameLoader()->client()->didChangePerformanceTiming();
     }
 }
 
 void DocumentLoader::updateForSameDocumentNavigation(const KURL& newURL, SameDocumentNavigationSource sameDocumentNavigationSource)
@@ skipping 558 matching lines @@
 {
     m_writer = createWriterFor(ownerDocument, init, mimeType(), m_writer ? m_writer->encoding() : emptyAtom, true, ForceSynchronousParsing);
     if (!source.isNull())
         m_writer->appendReplacingData(source);
     endWriting(m_writer.get());
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 } // namespace blink