[WIP] Introduce ScriptResourceData

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/ClassicPendingScript.h"
 
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/ScriptStreamer.h"
 #include "bindings/core/v8/V8BindingForCore.h"
 #include "core/dom/Document.h"
@@ skipping 124 matching lines @@
     // It is possible to get back a script resource with integrity metadata
     // for a request with an empty integrity attribute. In that case, the
     // integrity check should be skipped, so this check ensures that the
     // integrity attribute isn't empty in addition to checking if the
     // resource has empty integrity metadata.
     if (!element->IntegrityAttributeValue().IsEmpty()) {
       integrity_failure_ = GetResource()->IntegrityDisposition() !=
                            ResourceIntegrityDisposition::kPassed;
     }
   }
+  DCHECK(!resource_data_);
+  resource_data_ = GetResource()->ResourceData();
+  DCHECK(resource_data_);
 
   // We are now waiting for script streaming to finish.
   // If there is no script streamer, this step completes immediately.
   AdvanceReadyState(kWaitingForStreaming);
   if (streamer_)
     streamer_->NotifyFinished(resource);
   else
     FinishWaitingForStreaming();
 }
 
 void ClassicPendingScript::NotifyAppendData(ScriptResource* resource) {
   if (streamer_)
     streamer_->NotifyAppendData(resource);
 }
 
 DEFINE_TRACE(ClassicPendingScript) {
   visitor->Trace(streamer_);
+  visitor->Trace(resource_data_);
   ResourceOwner<ScriptResource>::Trace(visitor);
   MemoryCoordinatorClient::Trace(visitor);
   PendingScript::Trace(visitor);
 }
 
 ClassicScript* ClassicPendingScript::GetSource(const KURL& document_url,
                                                bool& error_occurred) const {
   CheckState();
   DCHECK(IsReady());
 
   error_occurred = ErrorOccurred();
   if (!is_external_) {
     return ClassicScript::Create(ScriptSourceCode(
         GetElement()->TextFromChildren(), document_url, StartingPosition()));
   }
 
-  DCHECK(GetResource()->IsLoaded());
+  CHECK(ResourceData());
   bool streamer_ready = (ready_state_ == kReady) && streamer_ &&
                         !streamer_->StreamingSuppressed();
   return ClassicScript::Create(
-      ScriptSourceCode(streamer_ready ? streamer_ : nullptr, GetResource()));
+      ScriptSourceCode(streamer_ready ? streamer_ : nullptr, ResourceData()));
 }
 
 void ClassicPendingScript::SetStreamer(ScriptStreamer* streamer) {
   DCHECK(streamer);
   DCHECK(!streamer_);
   DCHECK(!IsWatchingForLoad() || ready_state_ != kWaitingForResource);
   DCHECK(!streamer->IsFinished());
   DCHECK(ready_state_ == kWaitingForResource || ready_state_ == kReady);
 
   streamer_ = streamer;
@@ skipping 124 matching lines @@
   return ready_state_ == kReadyStreaming || (streamer_ && !IsReady());
 }
 
 bool ClassicPendingScript::WasCanceled() const {
   if (!is_external_)
     return false;
   return GetResource()->WasCanceled();
 }
 
 KURL ClassicPendingScript::UrlForClassicScript() const {
+  if (ResourceData())
+    return ResourceData()->Url();
+  CHECK(GetResource());
   return GetResource()->Url();
 }
 
 void ClassicPendingScript::RemoveFromMemoryCache() {
   GetMemoryCache()->Remove(GetResource());
 }
 
 }  // namespace blink