Make Resource RefCountedWillBeGarbageCollectedFinalized, attempt #2

third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp

 /*
  * Copyright (C) 2000 Peter Kelly (pmk@post.com)
  * Copyright (C) 2005, 2006, 2008, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2007 Samuel Weinig (sam@webkit.org)
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Holger Hans Peter Freyther
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 398 matching lines @@
     m_leafTextNode->appendData(toString(m_bufferedText.data(), m_bufferedText.size()));
     m_bufferedText.clear();
     m_leafTextNode = nullptr;
 
     // Mutation event handlers executed by appendData() might detach this parser.
     return !isStopped();
 }
 
 void XMLDocumentParser::detach()
 {
+    if (m_pendingScript) {
+        m_pendingScript->removeClient(this);
+        m_pendingScript = nullptr;
+    }
     clearCurrentNodeStack();
     ScriptableDocumentParser::detach();
 }
 
 void XMLDocumentParser::end()
 {
     TRACE_EVENT0("blink", "XMLDocumentParser::end");
     // XMLDocumentParserLibxml2 will do bad things to the document if doEnd() is called.
     // I don't believe XMLDocumentParserQt needs doEnd called in the fragment case.
     ASSERT(!m_parsingFragment);
@@ skipping 50 matching lines @@
 
 void XMLDocumentParser::notifyFinished(Resource* unusedResource)
 {
     ASSERT_UNUSED(unusedResource, unusedResource == m_pendingScript);
 
     ScriptSourceCode sourceCode(m_pendingScript.get());
     bool errorOccurred = m_pendingScript->errorOccurred();
     bool wasCanceled = m_pendingScript->wasCanceled();
 
     m_pendingScript->removeClient(this);
-    m_pendingScript = 0;
+    m_pendingScript = nullptr;
 
     RefPtrWillBeRawPtr<Element> e = m_scriptElement;
     m_scriptElement = nullptr;
 
     ScriptLoader* scriptLoader = toScriptLoaderIfPossible(e.get());
     ASSERT(scriptLoader);
 
     // JavaScript can detach this parser, make sure it's kept alive even if
     // detached.
     RefPtrWillBeRawPtr<XMLDocumentParser> protect(this);
@@ skipping 166 matching lines @@
         return &globalDescriptor;
 
     KURL finalURL;
     RefPtr<SharedBuffer> data;
 
     {
         Document* document = XMLDocumentParserScope::currentDocument;
         XMLDocumentParserScope scope(0);
         // FIXME: We should restore the original global error handler as well.
         FetchRequest request(ResourceRequest(url), FetchInitiatorTypeNames::xml, ResourceFetcher::defaultResourceOptions());
-        ResourcePtr<Resource> resource = RawResource::fetchSynchronously(request, document->fetcher());
+        RefPtrWillBeRawPtr<Resource> resource = RawResource::fetchSynchronously(request, document->fetcher());
         if (resource && !resource->errorOccurred()) {
             data = resource->resourceBuffer();
             finalURL = resource->response().url();
         }
     }
 
     // We have to check the URL again after the load to catch redirects.
     // See <https://bugs.webkit.org/show_bug.cgi?id=21963>.
     if (!shouldAllowExternalLoad(finalURL))
         return &globalDescriptor;
@@ skipping 108 matching lines @@
     , m_isCurrentlyParsing8BitChunk(false)
     , m_sawError(false)
     , m_sawCSS(false)
     , m_sawXSLTransform(false)
     , m_sawFirstElement(false)
     , m_isXHTMLDocument(false)
     , m_parserPaused(false)
     , m_requestingScript(false)
     , m_finishCalled(false)
     , m_xmlErrors(&document)
-    , m_pendingScript(0)
     , m_scriptStartPosition(TextPosition::belowRangePosition())
     , m_parsingFragment(false)
 {
     // This is XML being used as a document resource.
     if (frameView && document.isXMLDocument())
         UseCounter::count(document, UseCounter::XMLDocument);
 }
 
 XMLDocumentParser::XMLDocumentParser(DocumentFragment* fragment, Element* parentElement, ParserContentPolicy parserContentPolicy)
     : ScriptableDocumentParser(fragment->document(), parserContentPolicy)
     , m_hasView(false)
     , m_context(nullptr)
     , m_currentNode(fragment)
     , m_isCurrentlyParsing8BitChunk(false)
     , m_sawError(false)
     , m_sawCSS(false)
     , m_sawXSLTransform(false)
     , m_sawFirstElement(false)
     , m_isXHTMLDocument(false)
     , m_parserPaused(false)
     , m_requestingScript(false)
     , m_finishCalled(false)
     , m_xmlErrors(&fragment->document())
-    , m_pendingScript(0)
     , m_scriptStartPosition(TextPosition::belowRangePosition())
     , m_parsingFragment(true)
 {
 #if !ENABLE(OILPAN)
     fragment->ref();
 #endif
 
     // Add namespaces based on the parent node
     WillBeHeapVector<RawPtrWillBeMember<Element>> elemStack;
     while (parentElement) {
@@ skipping 26 matching lines @@
 
 XMLParserContext::~XMLParserContext()
 {
     if (m_context->myDoc)
         xmlFreeDoc(m_context->myDoc);
     xmlFreeParserCtxt(m_context);
 }
 
 XMLDocumentParser::~XMLDocumentParser()
 {
+    ASSERT(!m_pendingScript);
 #if !ENABLE(OILPAN)
     // The XMLDocumentParser will always be detached before being destroyed.
     ASSERT(m_currentNodeStack.isEmpty());
     ASSERT(!m_currentNode);
 #endif
-
-    // FIXME: m_pendingScript handling should be moved into XMLDocumentParser.cpp!
-    if (m_pendingScript)
-        m_pendingScript->removeClient(this);
 }
 
 DEFINE_TRACE(XMLDocumentParser)
 {
     visitor->trace(m_currentNode);
 #if ENABLE(OILPAN)
     visitor->trace(m_currentNodeStack);
 #endif
     visitor->trace(m_leafTextNode);
     visitor->trace(m_xmlErrors);
+    visitor->trace(m_pendingScript);
     visitor->trace(m_scriptElement);
     ScriptableDocumentParser::trace(visitor);
 }
 
 void XMLDocumentParser::doWrite(const String& parseString)
 {
     TRACE_EVENT0("blink", "XMLDocumentParser::doWrite");
     ASSERT(!isDetached());
     if (!m_context)
         initializeParserContext();
@@ skipping 793 matching lines @@
     sax.initialized = XML_SAX2_MAGIC;
     RefPtr<XMLParserContext> parser = XMLParserContext::createStringParser(&sax, &state);
     String parseString = "<?xml version=\"1.0\"?><attrs " + string + " />";
     parseChunk(parser->context(), parseString);
     finishParsing(parser->context());
     attrsOK = state.gotAttributes;
     return state.attributes;
 }
 
 } // namespace blink