diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/third_party/blink/renderer/core/script/modulator_impl_base.h | |
parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/script/modulator_impl_base.h')
-rw-r--r-- | chromium/third_party/blink/renderer/core/script/modulator_impl_base.h | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/chromium/third_party/blink/renderer/core/script/modulator_impl_base.h b/chromium/third_party/blink/renderer/core/script/modulator_impl_base.h index d6fa227d072..382ab46cb31 100644 --- a/chromium/third_party/blink/renderer/core/script/modulator_impl_base.h +++ b/chromium/third_party/blink/renderer/core/script/modulator_impl_base.h @@ -28,15 +28,15 @@ class ScriptState; // components together. class ModulatorImplBase : public Modulator { public: - virtual ~ModulatorImplBase(); - void Trace(blink::Visitor*); - virtual void TraceWrappers(const ScriptWrappableVisitor*) const; - - ExecutionContext* GetExecutionContext() const; + ~ModulatorImplBase() override; + void Trace(blink::Visitor*) override; + void TraceWrappers(ScriptWrappableVisitor*) const override; protected: explicit ModulatorImplBase(scoped_refptr<ScriptState>); + ExecutionContext* GetExecutionContext() const; + ScriptState* GetScriptState() override { return script_state_.get(); } private: @@ -51,9 +51,14 @@ class ModulatorImplBase : public Modulator { ReferrerPolicy GetReferrerPolicy() override; const SecurityOrigin* GetSecurityOriginForFetch() override; - void FetchTree(const ModuleScriptFetchRequest&, ModuleTreeClient*) override; - void FetchDescendantsForInlineScript(ModuleScript*, - ModuleTreeClient*) override; + void FetchTree(const KURL&, + WebURLRequest::RequestContext destination, + const ScriptFetchOptions&, + ModuleTreeClient*) override; + void FetchDescendantsForInlineScript( + ModuleScript*, + WebURLRequest::RequestContext destination, + ModuleTreeClient*) override; void FetchSingle(const ModuleScriptFetchRequest&, ModuleGraphLevel, SingleModuleClient*) override; |