Chromium Code Reviews| Index: third_party/WebKit/Source/platform/weborigin/KURL.cpp |
| diff --git a/third_party/WebKit/Source/platform/weborigin/KURL.cpp b/third_party/WebKit/Source/platform/weborigin/KURL.cpp |
| index 22e8e9b5df7d65af56a5072f44d998a17fb59dc6..e0928c3669aef1d1cf9c792ce1c26353fb3752da 100644 |
| --- a/third_party/WebKit/Source/platform/weborigin/KURL.cpp |
| +++ b/third_party/WebKit/Source/platform/weborigin/KURL.cpp |
| @@ -101,7 +101,7 @@ public: |
| { |
| } |
| - void ConvertFromUTF16(const url::UTF16Char* input, int inputLength, url::CanonOutput* output) override |
| + void ConvertFromUTF16(const base::char16* input, int inputLength, url::CanonOutput* output) override |
|
brettw
2015/10/05 18:08:23
There's a blink thread discussing what from base w
|
| { |
| CString encoded = m_encoding->normalizeAndEncode(String(input, inputLength), WTF::URLEncodedEntitiesForUnencodables); |
| output->Append(encoded.data(), static_cast<int>(encoded.length())); |