Fix PendingScript::errorOccurred() to be consistent with getSource()

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

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 207 matching lines @@
   visitor->trace(m_streamer);
   visitor->trace(m_client);
   ResourceOwner<ScriptResource>::trace(visitor);
   MemoryCoordinatorClient::trace(visitor);
 }
 
 ScriptSourceCode PendingScript::getSource(const KURL& documentURL,
                                           bool& errorOccurred) const {
   checkState();
 
+  errorOccurred = this->errorOccurred();
   if (resource()) {
-    errorOccurred = resource()->errorOccurred() || m_integrityFailure;
     DCHECK(resource()->isLoaded());
     if (m_streamer && !m_streamer->streamingSuppressed())
       return ScriptSourceCode(m_streamer, resource());
     return ScriptSourceCode(resource());
   }
 
-  errorOccurred = false;
   return ScriptSourceCode(m_element->textContent(), documentURL,
                           startingPosition());
 }
 
 void PendingScript::setStreamer(ScriptStreamer* streamer) {
   DCHECK(!m_streamer);
   DCHECK(!m_watchingForLoad);
   m_streamer = streamer;
   checkState();
 }
 
 bool PendingScript::isReady() const {
   checkState();
   if (resource()) {
     return resource()->isLoaded() && (!m_streamer || m_streamer->isFinished());
   }
 
   return true;
 }
 
 bool PendingScript::errorOccurred() const {
   checkState();
   if (resource())
-    return resource()->errorOccurred();
+    return resource()->errorOccurred() || m_integrityFailure;

[sof, 2017/02/23 08:10:48]

The ScriptLoader will consult the resource to decide if an error occurred upon
getting this finished notification - do you plan to update it to use this
predicate instead?

[hiroshige, 2017/02/23 16:41:25]

Oh, this line? I'll update it soon.
https://codesearch.chromium.org/chromium/src/third_party/WebKit/Source/core/d...

(I'm preparing for module support and trying to reduce direct references to
ScriptResource/ScriptSourceCode/etc. via PendingScript.)

 
   return false;
 }
 
 void PendingScript::onPurgeMemory() {
   checkState();
   if (!m_streamer)
     return;
   m_streamer->cancel();
   m_streamer = nullptr;
 }
 
 }  // namespace blink