Elaborate error handling on ScriptLoader::finishLoading()

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 349 matching lines @@
         executeScript(ScriptSourceCode(resource));
         dispatchLoadEvent();
     }
     resource->removeClient(this);
 }
 
 void ScriptLoader::cancel(Document* contextDocument)
 {
     if (!m_resource)
         return;
-    finishLoading(contextDocument, FinishWithErrorOrCancel);
-    stopLoadRequest();
+    finishLoading(contextDocument, FinishWithCancel);
 }
 
 void ScriptLoader::notifyFinished(Resource* resource)
 {
     // Resource possibly invokes this notifyFinished() more than
     // once because ScriptLoader doesn't unsubscribe itself from
     // Resource here and does it in execute() instead.
     // We use m_resource to check if this function is already called.
     ASSERT_UNUSED(resource, resource == m_resource);
     if (!m_resource)
         return;
 
     RefPtr<Document> elementDocument(m_element->document());
     RefPtr<Document> contextDocument = elementDocument->contextDocument().get();
-    finishLoading(contextDocument.get(), resource->errorOccurred() ? FinishWithErrorOrCancel : FinishSuccessfully);
+    finishLoading(contextDocument.get(), resource->errorOccurred() ? FinishWithError : FinishSuccessfully);
 }
 
 void ScriptLoader::finishLoading(Document* contextDocument, ScriptLoader::FinishType type)
 {
-    ASSERT(!m_willBeParserExecuted);
-
     if (!contextDocument)
         return;
 
-    if (type == FinishWithErrorOrCancel) {
+    switch (type) {
+    case FinishWithCancel:
+        if (!m_willBeParserExecuted)
+            contextDocument->scriptRunner()->notifyScriptLoadError(this, m_willExecuteInOrder ? ScriptRunner::IN_ORDER_EXECUTION : ScriptRunner::ASYNC_EXECUTION);
+        stopLoadRequest();
+        break;
+    case FinishWithError:
+        ASSERT(!m_willBeParserExecuted);
         dispatchErrorEvent();
         contextDocument->scriptRunner()->notifyScriptLoadError(this, m_willExecuteInOrder ? ScriptRunner::IN_ORDER_EXECUTION : ScriptRunner::ASYNC_EXECUTION);
-        return;
+        m_resource = 0;
+        break;
+    case FinishSuccessfully:
+        ASSERT(!m_willBeParserExecuted);
+        contextDocument->scriptRunner()->notifyScriptReady(this, m_willExecuteInOrder ? ScriptRunner::IN_ORDER_EXECUTION : ScriptRunner::ASYNC_EXECUTION);
+        m_resource = 0;
+        break;
     }
-    if (m_willExecuteInOrder)
-        contextDocument->scriptRunner()->notifyScriptReady(this, ScriptRunner::IN_ORDER_EXECUTION);
-    else
-        contextDocument->scriptRunner()->notifyScriptReady(this, ScriptRunner::ASYNC_EXECUTION);
-
-    m_resource = 0;
 }
 
 bool ScriptLoader::ignoresLoadRequest() const
 {
     return m_alreadyStarted || m_isExternalScript || m_parserInserted || !element() || !element()->inDocument();
 }
 
 bool ScriptLoader::isScriptForEventSupported() const
 {
     String eventAttribute = client()->eventAttributeValue();
@@ skipping 32 matching lines @@
     if (isHTMLScriptLoader(element))
         return toHTMLScriptElement(element)->loader();
 
     if (isSVGScriptLoader(element))
         return toSVGScriptElement(element)->loader();
 
     return 0;
 }
 
 }