Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Unified Diff: third_party/WebKit/Source/core/dom/ScriptLoader.h

Issue 2665503002: Make |ScriptLoader::m_characterEncoding| a local variable (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/ScriptLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/ScriptLoader.h
diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.h b/third_party/WebKit/Source/core/dom/ScriptLoader.h
index d44a5ec08bc04121ab574f91fbded8cbe33d67a2..3935fe1c45d2b4e3e52cf36dc873e24efa01f0e7 100644
--- a/third_party/WebKit/Source/core/dom/ScriptLoader.h
+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.h
@@ -68,7 +68,6 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
const TextPosition& scriptStartPosition = TextPosition::minimumPosition(),
LegacyTypeSupport = DisallowLegacyTypeInTypeAttribute);
- String scriptCharset() const { return m_characterEncoding; }
String scriptContent() const;
// Returns false if and only if execution was blocked.
bool executeScript(const ScriptSourceCode&);
@@ -129,7 +128,9 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
bool isScriptForEventSupported() const;
void logScriptMIMEType(LocalFrame*, ScriptResource*, const String&);
- bool fetchScript(const String& sourceUrl, FetchRequest::DeferOption);
+ bool fetchScript(const String& sourceUrl,
+ const String& encoding,
+ FetchRequest::DeferOption);
bool doExecuteScript(const ScriptSourceCode&);
ScriptLoaderClient* client() const;
@@ -140,8 +141,6 @@ class CORE_EXPORT ScriptLoader : public GarbageCollectedFinalized<ScriptLoader>,
Member<Element> m_element;
Member<ScriptResource> m_resource;
WTF::OrdinalNumber m_startLineNumber;
- String m_characterEncoding;
- String m_fallbackCharacterEncoding;
bool m_parserInserted : 1;
bool m_isExternalScript : 1;
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/ScriptLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698