Re-order unregistration and detachment of failed ScriptLoader.

third_party/WebKit/Source/core/dom/ScriptLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 445 matching lines @@
 
     RefPtrWillBeRawPtr<Document> elementDocument(m_element->document());
     RefPtrWillBeRawPtr<Document> contextDocument = elementDocument->contextDocument().get();
     if (!contextDocument)
         return;
 
     ASSERT_UNUSED(resource, resource == m_resource);
 
     ScriptRunner::ExecutionType runOrder = m_willExecuteInOrder ? ScriptRunner::IN_ORDER_EXECUTION : ScriptRunner::ASYNC_EXECUTION;
     if (m_resource->errorOccurred()) {
+        contextDocument->scriptRunner()->notifyScriptLoadError(this, runOrder);
         dispatchErrorEvent();
-        // The error handler can move the HTMLScriptElement to a new document.
-        // In that case, we must notify the ScriptRunner of the new document,
-        // not the ScriptRunner of the old docuemnt.
-        contextDocument = m_element->document().contextDocument().get();
-        if (!contextDocument)
-            return;
-        contextDocument->scriptRunner()->notifyScriptLoadError(this, runOrder);
+        detach();
         return;
     }
     contextDocument->scriptRunner()->notifyScriptReady(this, runOrder);
     m_pendingScript->stopWatchingForLoad();
 }
 
 bool ScriptLoader::ignoresLoadRequest() const
 {
     return m_alreadyStarted || m_isExternalScript || m_parserInserted || !element() || !element()->inDocument();
 }
@@ skipping 34 matching lines @@
     if (isHTMLScriptLoader(element))
         return toHTMLScriptElement(element)->loader();
 
     if (isSVGScriptLoader(element))
         return toSVGScriptElement(element)->loader();
 
     return 0;
 }
 
 } // namespace blink