Use ScriptLoader::errorOccurred() instead of Resource in 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
@@ skipping 834 matching lines @@
   }
 
   DCHECK(m_asyncExecType != ScriptRunner::None);
 
   Document* contextDocument = m_element->document().contextDocument();
   if (!contextDocument) {
     detachPendingScript();
     return;
   }
 
   DCHECK_EQ(pendingScript->resource(), m_resource);

[sof, 2017/02/24 07:29:22]

Given the DCHECK_EQ() at the start of this method, we don't need this one also.

[hiroshige, 2017/02/24 18:16:57]

The DCHECK_EQ() at the start of this method checks that
|m_pendingScript == pendingScript|, and
this DCHECK_EQ() virtually checks that
|m_pendingScript->resource() == m_resource|, and
I think these are two orthogonal assumptions
and are useful to catch current bugs or future regressions.

[sof, 2017/02/24 18:26:43]

If you really think that's valuable, then move it up next to that other
DCHECK_EQ() ?

[hiroshige, 2017/02/25 00:31:50]

Done.

 
-  if (m_resource->errorOccurred()) {
+  if (errorOccurred()) {
     contextDocument->scriptRunner()->notifyScriptLoadError(this,
                                                            m_asyncExecType);
     detachPendingScript();
     dispatchErrorEvent();
     return;
   }
   contextDocument->scriptRunner()->notifyScriptReady(this, m_asyncExecType);
   m_pendingScript->stopWatchingForLoad();
 }
 
@@ skipping 49 matching lines @@
   if (isHTMLScriptLoader(element))
     return toHTMLScriptElement(element)->loader();
 
   if (isSVGScriptLoader(element))
     return toSVGScriptElement(element)->loader();
 
   return 0;
 }
 
 }  // namespace blink