Commit 43fd0bde authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot

Remove ScriptElementBase::InitiatorName()

ScriptElementBase::InitiatorName() is "script" for both of HTMLScriptElement and
SVGScriptElement.
This CL replaces InitiatorName() with hard-coded "script" to reduce dependencies to
ScriptElementBase.

Bug: 777626
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I39bf17f0e95e169acf2cf4956c84d35b0511b618
Reviewed-on: https://chromium-review.googlesource.com/740873
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: default avatarKouhei Ueno <kouhei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513079}
parent 37638978
...@@ -32,7 +32,7 @@ ClassicPendingScript* ClassicPendingScript::Fetch( ...@@ -32,7 +32,7 @@ ClassicPendingScript* ClassicPendingScript::Fetch(
// Step 1. ... "script", ... [spec text] // Step 1. ... "script", ... [spec text]
ResourceLoaderOptions resource_loader_options; ResourceLoaderOptions resource_loader_options;
resource_loader_options.initiator_info.name = element->InitiatorName(); resource_loader_options.initiator_info.name = "script";
FetchParameters params(resource_request, resource_loader_options); FetchParameters params(resource_request, resource_loader_options);
// Step 1. ... and CORS setting. [spec text] // Step 1. ... and CORS setting. [spec text]
......
...@@ -56,7 +56,6 @@ class CORE_EXPORT ScriptElementBase : public GarbageCollectedMixin { ...@@ -56,7 +56,6 @@ class CORE_EXPORT ScriptElementBase : public GarbageCollectedMixin {
virtual bool IsConnected() const = 0; virtual bool IsConnected() const = 0;
virtual bool HasChildren() const = 0; virtual bool HasChildren() const = 0;
virtual const AtomicString& GetNonceForElement() const = 0; virtual const AtomicString& GetNonceForElement() const = 0;
virtual AtomicString InitiatorName() const = 0;
virtual bool AllowInlineScriptForCSP(const AtomicString& nonce, virtual bool AllowInlineScriptForCSP(const AtomicString& nonce,
const WTF::OrdinalNumber&, const WTF::OrdinalNumber&,
......
...@@ -205,10 +205,6 @@ bool HTMLScriptElement::AllowInlineScriptForCSP( ...@@ -205,10 +205,6 @@ bool HTMLScriptElement::AllowInlineScriptForCSP(
inline_type); inline_type);
} }
AtomicString HTMLScriptElement::InitiatorName() const {
return Element::localName();
}
Document& HTMLScriptElement::GetDocument() const { Document& HTMLScriptElement::GetDocument() const {
return Node::GetDocument(); return Node::GetDocument();
} }
......
...@@ -96,7 +96,6 @@ class CORE_EXPORT HTMLScriptElement final : public HTMLElement, ...@@ -96,7 +96,6 @@ class CORE_EXPORT HTMLScriptElement final : public HTMLElement,
const WTF::OrdinalNumber&, const WTF::OrdinalNumber&,
const String& script_content, const String& script_content,
ContentSecurityPolicy::InlineType) override; ContentSecurityPolicy::InlineType) override;
AtomicString InitiatorName() const override;
void DispatchLoadEvent() override; void DispatchLoadEvent() override;
void DispatchErrorEvent() override; void DispatchErrorEvent() override;
void SetScriptElementForBinding( void SetScriptElementForBinding(
......
...@@ -143,10 +143,6 @@ bool SVGScriptElement::AllowInlineScriptForCSP( ...@@ -143,10 +143,6 @@ bool SVGScriptElement::AllowInlineScriptForCSP(
inline_type); inline_type);
} }
AtomicString SVGScriptElement::InitiatorName() const {
return Element::localName();
}
Document& SVGScriptElement::GetDocument() const { Document& SVGScriptElement::GetDocument() const {
return Node::GetDocument(); return Node::GetDocument();
} }
......
...@@ -90,7 +90,6 @@ class SVGScriptElement final : public SVGElement, ...@@ -90,7 +90,6 @@ class SVGScriptElement final : public SVGElement,
const WTF::OrdinalNumber&, const WTF::OrdinalNumber&,
const String& script_content, const String& script_content,
ContentSecurityPolicy::InlineType) override; ContentSecurityPolicy::InlineType) override;
AtomicString InitiatorName() const override;
Document& GetDocument() const override; Document& GetDocument() const override;
void DispatchLoadEvent() override; void DispatchLoadEvent() override;
void DispatchErrorEvent() override; void DispatchErrorEvent() override;
......
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