diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-02-14 09:51:16 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-02-15 17:53:12 +0000 |
| commit | fa79a21c87b6c61d2ac8d517ccbda72fc3027444 (patch) | |
| tree | 28f7a847b56ac6a49e2b4bab5e6ddac89e9ffb42 | |
| parent | 6c56c89f1a0755e7036416b27fc146ff0286f98f (diff) | |
| download | qtwebengine-chromium-fa79a21c87b6c61d2ac8d517ccbda72fc3027444.tar.gz | |
Fix extensions build for Windows on 71-based
Missing return value and narrowing conversion were reported as
as errors by MSVC, which seems to be a bit stricter for some
things than the other compilers.
Change-Id: I58f07d79a823ffabf70f2c1da2de5469506ed2a3
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/extensions/browser/blob_reader.cc | 2 | ||||
| -rw-r--r-- | chromium/extensions/renderer/i18n_hooks_util.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/extensions/browser/blob_reader.cc b/chromium/extensions/browser/blob_reader.cc index f4f4156b1dd..6be1f228859 100644 --- a/chromium/extensions/browser/blob_reader.cc +++ b/chromium/extensions/browser/blob_reader.cc @@ -32,7 +32,7 @@ void BlobReader::SetByteRange(int64_t offset, int64_t length) { CHECK_GT(length, 0); CHECK_LE(offset, std::numeric_limits<int64_t>::max() - length); - read_range_ = Range{offset, length}; + read_range_ = Range{static_cast<uint64_t>(offset), static_cast<uint64_t>(length)}; } void BlobReader::Start() { diff --git a/chromium/extensions/renderer/i18n_hooks_util.cc b/chromium/extensions/renderer/i18n_hooks_util.cc index d4fdaf37933..0d2b0ea8ff4 100644 --- a/chromium/extensions/renderer/i18n_hooks_util.cc +++ b/chromium/extensions/renderer/i18n_hooks_util.cc @@ -223,8 +223,8 @@ v8::Local<v8::Value> DetectTextLanguage(v8::Local<v8::Context> context, // Populate LanguageDetectionResult with prediction reliability, languages, // and the corresponding percentages. InitDetectedLanguages(lang_results, &result); - return result.ToV8(context); #endif // !defined(TOOLKIT_QT) + return result.ToV8(context); } } // namespace i18n_hooks |