diff options
| author | Haibo Huang <hhb@google.com> | 2019-09-10 01:12:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-10 01:12:28 +0000 |
| commit | 28baf530494c85e228bc391e000934ab2bccc787 (patch) | |
| tree | d386ffd482381a6b30932920a2b23e83a39cfc2b | |
| parent | dbce09173f2eaa34c54da9cb977daf3cacd0cc00 (diff) | |
| parent | 54db6330a9cb73294b1fced2ec658351bbbaa51d (diff) | |
| download | zlib-28baf530494c85e228bc391e000934ab2bccc787.tar.gz | |
Merge "Upgrade zlib to 0044d0424c7f7d15436541ed1ecc89479b8bfda4"
| -rw-r--r-- | BUILD.gn | 2 | ||||
| -rw-r--r-- | METADATA | 4 | ||||
| -rw-r--r-- | contrib/bench/OWNERS | 1 | ||||
| -rw-r--r-- | google/zip_reader.cc | 3 | ||||
| -rw-r--r-- | google/zip_reader.h | 2 | ||||
| -rw-r--r-- | google/zip_reader_unittest.cc | 2 |
6 files changed, 7 insertions, 7 deletions
@@ -98,7 +98,7 @@ if (use_arm_neon_optimizations) { import("//build/config/android/config.gni") if (defined(android_ndk_root) && android_ndk_root != "") { deps = [ - "//third_party/android_sdk:cpu_features", + "//third_party/android_ndk:cpu_features", ] } else { assert(false, "CPU detection requires the Android NDK") @@ -5,11 +5,11 @@ third_party { type: GIT value: "https://chromium.googlesource.com/chromium/src/third_party/zlib/" } - version: "ddd7b06cf8c34e638643f7ce888bfc7c56e96933" + version: "0044d0424c7f7d15436541ed1ecc89479b8bfda4" license_type: NOTICE last_upgrade_date { year: 2019 - month: 8 + month: 9 day: 9 } } diff --git a/contrib/bench/OWNERS b/contrib/bench/OWNERS new file mode 100644 index 0000000..f1e3d4f --- /dev/null +++ b/contrib/bench/OWNERS @@ -0,0 +1 @@ +noel@chromium.org diff --git a/google/zip_reader.cc b/google/zip_reader.cc index 63d2319..6bba0cf 100644 --- a/google/zip_reader.cc +++ b/google/zip_reader.cc @@ -134,8 +134,7 @@ ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip, last_modified_ = base::Time::UnixEpoch(); } -ZipReader::ZipReader() - : weak_ptr_factory_(this) { +ZipReader::ZipReader() { Reset(); } diff --git a/google/zip_reader.h b/google/zip_reader.h index aacffda..7a43d3a 100644 --- a/google/zip_reader.h +++ b/google/zip_reader.h @@ -224,7 +224,7 @@ class ZipReader { bool reached_end_; std::unique_ptr<EntryInfo> current_entry_info_; - base::WeakPtrFactory<ZipReader> weak_ptr_factory_; + base::WeakPtrFactory<ZipReader> weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ZipReader); }; diff --git a/google/zip_reader_unittest.cc b/google/zip_reader_unittest.cc index a8b1ef2..aa20185 100644 --- a/google/zip_reader_unittest.cc +++ b/google/zip_reader_unittest.cc @@ -22,7 +22,7 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "base/test/scoped_task_environment.h" +#include "base/test/task_environment.h" #include "base/time/time.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" |