From 2a19c63448c84c1805fb1a585c3651318bb86ca7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 28 Aug 2018 15:28:34 +0200 Subject: BASELINE: Update Chromium to 69.0.3497.70 Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0 Reviewed-by: Allan Sandfeld Jensen --- chromium/third_party/blink/renderer/core/script/script_loader.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'chromium/third_party/blink/renderer/core/script/script_loader.h') diff --git a/chromium/third_party/blink/renderer/core/script/script_loader.h b/chromium/third_party/blink/renderer/core/script/script_loader.h index 4eecf66e214..4a04c488630 100644 --- a/chromium/third_party/blink/renderer/core/script/script_loader.h +++ b/chromium/third_party/blink/renderer/core/script/script_loader.h @@ -29,7 +29,7 @@ #include "third_party/blink/renderer/core/script/script.h" #include "third_party/blink/renderer/core/script/script_runner.h" #include "third_party/blink/renderer/core/script/script_scheduling_type.h" -#include "third_party/blink/renderer/platform/bindings/script_wrappable.h" +#include "third_party/blink/renderer/platform/bindings/name_client.h" #include "third_party/blink/renderer/platform/bindings/trace_wrapper_member.h" #include "third_party/blink/renderer/platform/loader/fetch/integrity_metadata.h" #include "third_party/blink/renderer/platform/loader/fetch/resource_loader_options.h" @@ -40,17 +40,16 @@ namespace blink { +class FetchClientSettingsObjectSnapshot; class ScriptElementBase; class Script; - class ScriptResource; - class Modulator; class CORE_EXPORT ScriptLoader final : public GarbageCollectedFinalized, public PendingScriptClient, - public TraceWrapperBase { + public NameClient { USING_GARBAGE_COLLECTED_MIXIN(ScriptLoader); public: @@ -62,7 +61,6 @@ class CORE_EXPORT ScriptLoader final ~ScriptLoader() override; void Trace(blink::Visitor*) override; - void TraceWrappers(ScriptWrappableVisitor*) const override; const char* NameInHeapSnapshot() const override { return "ScriptLoader"; } enum LegacyTypeSupport { @@ -131,6 +129,7 @@ class CORE_EXPORT ScriptLoader final const WTF::TextEncoding&); // https://html.spec.whatwg.org/multipage/webappapis.html#fetch-a-module-script-tree void FetchModuleScriptTree(const KURL&, + FetchClientSettingsObjectSnapshot*, Modulator*, const ScriptFetchOptions&); -- cgit v1.2.1