Revert of Split PendingScript into PendingScript and ClassicPendingScript

third_party/WebKit/Source/bindings/core/v8/ScriptStreamer.cpp

 // Copyright 2014 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 "bindings/core/v8/ScriptStreamer.h"
 
 #include <memory>
 #include "bindings/core/v8/ScriptStreamerThread.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
-#include "core/dom/ClassicPendingScript.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
+#include "core/dom/PendingScript.h"
 #include "core/frame/Settings.h"
 #include "core/html/parser/TextResourceDecoder.h"
 #include "core/loader/resource/ScriptResource.h"
 #include "platform/CrossThreadFunctional.h"
 #include "platform/Histogram.h"
 #include "platform/SharedBuffer.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/loader/fetch/CachedMetadata.h"
 #include "platform/wtf/Deque.h"
 #include "platform/wtf/PtrUtil.h"
@@ skipping 295 matching lines @@
   //   bookmarkPosition: position of the bookmark.
   SourceStreamDataQueue data_queue_;  // Thread safe.
   size_t queue_lead_position_;        // Only used by v8 thread.
   size_t queue_tail_position_;  // Used by both threads; guarded by m_mutex.
 
   RefPtr<WebTaskRunner> loading_task_runner_;
 };
 
 size_t ScriptStreamer::small_script_threshold_ = 30 * 1024;
 
-void ScriptStreamer::StartStreaming(ClassicPendingScript* script,
+void ScriptStreamer::StartStreaming(PendingScript* script,
                                     Type script_type,
                                     Settings* settings,
                                     ScriptState* script_state,
                                     RefPtr<WebTaskRunner> loading_task_runner) {
   // We don't yet know whether the script will really be streamed. E.g.,
   // suppressing streaming for short scripts is done later. Record only the
   // sure negative cases here.
   bool started_streaming =
       StartStreamingInternal(script, script_type, settings, script_state,
                              std::move(loading_task_runner));
@@ skipping 169 matching lines @@
     SuppressStreaming();
   }
   if (stream_)
     stream_->DidFinishLoading();
   loading_finished_ = true;
 
   NotifyFinishedToClient();
 }
 
 ScriptStreamer::ScriptStreamer(
-    ClassicPendingScript* script,
+    PendingScript* script,
     Type script_type,
     ScriptState* script_state,
     v8::ScriptCompiler::CompileOptions compile_options,
     RefPtr<WebTaskRunner> loading_task_runner)
     : pending_script_(script),
       resource_(script->GetResource()),
       detached_(false),
       stream_(0),
       loading_finished_(false),
       parsing_finished_(false),
@@ skipping 43 matching lines @@
   // parse error, the V8 side can complete before loading has finished. Send
   // the notification after both loading and V8 side operations have
   // completed.
   if (!IsFinished())
     return;
 
   pending_script_->StreamingFinished();
 }
 
 bool ScriptStreamer::StartStreamingInternal(
-    ClassicPendingScript* script,
+    PendingScript* script,
     Type script_type,
     Settings* settings,
     ScriptState* script_state,
     RefPtr<WebTaskRunner> loading_task_runner) {
   DCHECK(IsMainThread());
   DCHECK(script_state->ContextIsValid());
   ScriptResource* resource = script->GetResource();
   if (resource->IsLoaded()) {
     RecordNotStreamingReasonHistogram(script_type, kAlreadyLoaded);
     return false;
   }
   if (!resource->Url().ProtocolIsInHTTPFamily()) {
     RecordNotStreamingReasonHistogram(script_type, kNotHTTP);
     return false;
   }
   if (resource->IsCacheValidator()) {
     RecordNotStreamingReasonHistogram(script_type, kReload);
     // This happens e.g., during reloads. We're actually not going to load
-    // the current Resource of the ClassicPendingScript but switch to another
+    // the current Resource of the PendingScript but switch to another
     // Resource -> don't stream.
     return false;
   }
   // We cannot filter out short scripts, even if we wait for the HTTP headers
   // to arrive: the Content-Length HTTP header is not sent for chunked
   // downloads.
 
   // Decide what kind of cached data we should produce while streaming. Only
   // produce parser cache if the non-streaming compile takes advantage of it.
   v8::ScriptCompiler::CompileOptions compile_option =
       v8::ScriptCompiler::kNoCompileOptions;
   if (settings->GetV8CacheOptions() == kV8CacheOptionsParse)
     compile_option = v8::ScriptCompiler::kProduceParserCache;
 
-  // The Resource might go out of scope if the script is no longer needed.
-  // This makes ClassicPendingScript notify the ScriptStreamer when it is
+  // The Resource might go out of scope if the script is no longer
+  // needed. This makes PendingScript notify the ScriptStreamer when it is
   // destroyed.
   script->SetStreamer(ScriptStreamer::Create(script, script_type, script_state,
                                              compile_option,
                                              std::move(loading_task_runner)));
 
   return true;
 }
 
 }  // namespace blink