diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-03 17:20:32 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-05 09:28:09 +0000 |
| commit | bb09965444b5bb20b096a291445170876225268d (patch) | |
| tree | b5f6596f7e6e941b1d7d72f0ce5181500c261529 /chromium/v8/src/runtime | |
| parent | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (diff) | |
| download | qtwebengine-chromium-bb09965444b5bb20b096a291445170876225268d.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.98
Change-Id: Ib913750d687f29e036959c62a0cabf2412a8faa7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/v8/src/runtime')
| -rw-r--r-- | chromium/v8/src/runtime/runtime-i18n.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chromium/v8/src/runtime/runtime-i18n.cc b/chromium/v8/src/runtime/runtime-i18n.cc index 0b453819146..e89175a37db 100644 --- a/chromium/v8/src/runtime/runtime-i18n.cc +++ b/chromium/v8/src/runtime/runtime-i18n.cc @@ -43,6 +43,7 @@ #include "unicode/uloc.h" #include "unicode/unistr.h" #include "unicode/unum.h" +#include "unicode/ustring.h" #include "unicode/uversion.h" @@ -609,10 +610,11 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) { String::FlatContent flat2 = string2->GetFlatContent(); std::unique_ptr<uc16[]> sap1; std::unique_ptr<uc16[]> sap2; - const UChar* string_val1 = GetUCharBufferFromFlat(flat1, &sap1, length1); - const UChar* string_val2 = GetUCharBufferFromFlat(flat2, &sap2, length2); - result = - collator->compare(string_val1, length1, string_val2, length2, status); + icu::UnicodeString string_val1( + FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); + icu::UnicodeString string_val2( + FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); + result = collator->compare(string_val1, string_val2, status); } if (U_FAILURE(status)) return isolate->ThrowIllegalOperation(); |