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

Side by Side 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, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 21 matching lines...) Expand all
32 32
33 #include "platform/weborigin/KURL.h" 33 #include "platform/weborigin/KURL.h"
34 #include "third_party/ced/src/compact_enc_det/compact_enc_det.h" 34 #include "third_party/ced/src/compact_enc_det/compact_enc_det.h"
35 #include "wtf/text/TextEncoding.h" 35 #include "wtf/text/TextEncoding.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 bool detectTextEncoding(const char* data, 39 bool detectTextEncoding(const char* data,
40 size_t length, 40 size_t length,
41 const char* hintEncodingName, 41 const char* hintEncodingName,
42 const char* hintUrl, 42 const KURL& hintUrl,
43 const char* hintUserLanguage, 43 const char* hintUserLanguage,
44 WTF::TextEncoding* detectedEncoding) { 44 WTF::TextEncoding* detectedEncoding) {
45 *detectedEncoding = WTF::TextEncoding(); 45 *detectedEncoding = WTF::TextEncoding();
46 Language language; 46 Language language;
47 LanguageFromCode(hintUserLanguage, &language); 47 LanguageFromCode(hintUserLanguage, &language);
48 int consumedBytes; 48 int consumedBytes;
49 bool isReliable; 49 bool isReliable;
50 Encoding encoding = CompactEncDet::DetectEncoding( 50 Encoding encoding = CompactEncDet::DetectEncoding(
51 data, length, hintUrl, nullptr, nullptr, 51 data, length, hintUrl.getString().ascii().data(), nullptr, nullptr,
52 EncodingNameAliasToEncoding(hintEncodingName), language, 52 EncodingNameAliasToEncoding(hintEncodingName), language,
53 CompactEncDet::WEB_CORPUS, 53 CompactEncDet::WEB_CORPUS,
54 false, // Include 7-bit encodings to detect ISO-2022-JP 54 false, // Include 7-bit encodings to detect ISO-2022-JP
55 &consumedBytes, &isReliable); 55 &consumedBytes, &isReliable);
56 56
57 // Should return false if the detected encoding is UTF8. This helps prevent 57 // Should return false if the detected encoding is UTF8. This helps prevent
58 // modern web sites from neglecting proper encoding labelling and simply 58 // modern web sites from neglecting proper encoding labelling and simply
59 // relying on browser-side encoding detection. Encoding detection is supposed 59 // relying on browser-side encoding detection. Encoding detection is supposed
60 // to work for web sites with legacy encoding only (so this doesn't have to 60 // to work for web sites with legacy encoding only (so this doesn't have to
61 // be applied to local file resources). 61 // be applied to local file resources).
62 // Detection failure leads |TextResourceDecoder| to use its default encoding 62 // Detection failure leads |TextResourceDecoder| to use its default encoding
63 // determined from system locale or TLD. 63 // determined from system locale or TLD.
64 String protocol = hintUrl ? KURL(ParsedURLString, hintUrl).protocol() : ""; 64 if (encoding == UNKNOWN_ENCODING ||
65 if (encoding == UNKNOWN_ENCODING || (protocol != "file" && encoding == UTF8)) 65 (hintUrl.protocol() != "file" && encoding == UTF8))
66 return false; 66 return false;
67 67
68 *detectedEncoding = WTF::TextEncoding(MimeEncodingName(encoding)); 68 *detectedEncoding = WTF::TextEncoding(MimeEncodingName(encoding));
69 return true; 69 return true;
70 } 70 }
71 71
72 } // namespace blink 72 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698