Merge 174019 "Make ScriptLoader into a ResourceOwner"

Source/core/xml/parser/XMLDocumentParser.cpp

Index: Source/core/xml/parser/XMLDocumentParser.cpp
===================================================================
--- Source/core/xml/parser/XMLDocumentParser.cpp	(revision 174056)
+++ Source/core/xml/parser/XMLDocumentParser.cpp	(working copy)
@@ -1036,14 +1036,15 @@
     ASSERT(!m_pendingScript);
     m_requestingScript = true;
 
-    if (scriptLoader->prepareScript(m_scriptStartPosition, ScriptLoader::AllowLegacyTypeInTypeAttribute)) {
+    ScriptPrep prep = scriptLoader->prepareScript(m_scriptStartPosition, ScriptLoader::AllowLegacyTypeInTypeAttribute);
+    if (prep.succeeded()) {
         // FIXME: Script execution should be shared between
         // the libxml2 and Qt XMLDocumentParser implementations.
 
         if (scriptLoader->readyToBeParserExecuted()) {
             scriptLoader->executeScript(ScriptSourceCode(scriptLoader->scriptContent(), document()->url(), m_scriptStartPosition));
         } else if (scriptLoader->willBeParserExecuted()) {
-            m_pendingScript = scriptLoader->resource();
+            m_pendingScript = prep.resource();
             m_scriptElement = element;
             m_pendingScript->addClient(this);