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

Unified Diff: third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp

Issue 2786913002: Replace the type of hint url for blink::detectTextEncoding (Closed)
Patch Set: const KURL Created 3 years, 9 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
Index: third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp
diff --git a/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp b/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp
index 0df2c620e0fe2dd69f41e41fe1c65baf678adc55..d32e81d2f1b970a90f46d191efb891050c237923 100644
--- a/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp
+++ b/third_party/WebKit/Source/platform/text/TextEncodingDetector.cpp
@@ -39,7 +39,7 @@ namespace blink {
bool detectTextEncoding(const char* data,
size_t length,
const char* hintEncodingName,
- const char* hintUrl,
+ const KURL& hintUrl,
const char* hintUserLanguage,
WTF::TextEncoding* detectedEncoding) {
*detectedEncoding = WTF::TextEncoding();
@@ -48,7 +48,7 @@ bool detectTextEncoding(const char* data,
int consumedBytes;
bool isReliable;
Encoding encoding = CompactEncDet::DetectEncoding(
- data, length, hintUrl, nullptr, nullptr,
+ data, length, hintUrl.getString().ascii().data(), nullptr, nullptr,
EncodingNameAliasToEncoding(hintEncodingName), language,
CompactEncDet::WEB_CORPUS,
false, // Include 7-bit encodings to detect ISO-2022-JP
@@ -61,8 +61,8 @@ bool detectTextEncoding(const char* data,
// be applied to local file resources).
// Detection failure leads |TextResourceDecoder| to use its default encoding
// determined from system locale or TLD.
- String protocol = hintUrl ? KURL(ParsedURLString, hintUrl).protocol() : "";
- if (encoding == UNKNOWN_ENCODING || (protocol != "file" && encoding == UTF8))
+ if (encoding == UNKNOWN_ENCODING ||
+ (hintUrl.protocol() != "file" && encoding == UTF8))
return false;
*detectedEncoding = WTF::TextEncoding(MimeEncodingName(encoding));

Powered by Google App Engine
This is Rietveld 408576698