Commit e346670f authored by Nate Chapin's avatar Nate Chapin Committed by Commit Bot

Have ScriptStreamerTest go through ClassicPendingScript::Fetch()

This lets us get rid of the last non-trival usage of
ResourceClient::SetResource in ClassicPendingScript

Bug: 793028
Change-Id: I39a4859cb1b941ff6a399fad88d40e353df4d462
Reviewed-on: https://chromium-review.googlesource.com/822176Reviewed-by: default avatarHiroshige Hayashizaki <hiroshige@chromium.org>
Commit-Queue: Nate Chapin <japhet@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523569}
parent 1beaf80f
...@@ -54,18 +54,6 @@ ClassicPendingScript* ClassicPendingScript::Fetch( ...@@ -54,18 +54,6 @@ ClassicPendingScript* ClassicPendingScript::Fetch(
return pending_script; return pending_script;
} }
ClassicPendingScript* ClassicPendingScript::CreateExternalForTest(
ScriptElementBase* element,
ScriptResource* resource) {
DCHECK(resource);
ClassicPendingScript* pending_script = new ClassicPendingScript(
element, TextPosition(), ScriptSourceLocationType::kExternalFile,
ScriptFetchOptions(), true /* is_external */);
pending_script->SetResource(resource);
pending_script->CheckState();
return pending_script;
}
ClassicPendingScript* ClassicPendingScript::CreateInline( ClassicPendingScript* ClassicPendingScript::CreateInline(
ScriptElementBase* element, ScriptElementBase* element,
const TextPosition& starting_position, const TextPosition& starting_position,
...@@ -114,7 +102,7 @@ void ClassicPendingScript::Prefinalize() { ...@@ -114,7 +102,7 @@ void ClassicPendingScript::Prefinalize() {
void ClassicPendingScript::DisposeInternal() { void ClassicPendingScript::DisposeInternal() {
MemoryCoordinator::Instance().UnregisterClient(this); MemoryCoordinator::Instance().UnregisterClient(this);
SetResource(nullptr); ClearResource();
integrity_failure_ = false; integrity_failure_ = false;
CancelStreaming(); CancelStreaming();
} }
......
...@@ -41,10 +41,6 @@ class CORE_EXPORT ClassicPendingScript final : public PendingScript, ...@@ -41,10 +41,6 @@ class CORE_EXPORT ClassicPendingScript final : public PendingScript,
ScriptElementBase*, ScriptElementBase*,
FetchParameters::DeferOption); FetchParameters::DeferOption);
// For a script from an external file, with a supplied ScriptResource.
static ClassicPendingScript* CreateExternalForTest(ScriptElementBase*,
ScriptResource*);
// For an inline script. // For an inline script.
static ClassicPendingScript* CreateInline(ScriptElementBase*, static ClassicPendingScript* CreateInline(ScriptElementBase*,
const TextPosition&, const TextPosition&,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment